Menu
▾
▴
osmose-dev-devel — Thsi list is made for the Osmose developpers.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(6) |
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(19) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(22) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(23) |
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
(11) |
Mar
|
Apr
(37) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/themeeditor/themecomponent In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6408/src/osmose/application/themeeditor/themecomponent Modified Files: OSMThemeBackGroundComponent.java OSMThemeMediasConstraintsComponent.java OSMThemeConstraintsComponent.java Log Message: Conversion to UTF8 encoding Index: OSMThemeConstraintsComponent.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/themeeditor/themecomponent/OSMThemeConstraintsComponent.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMThemeConstraintsComponent.java 30 Aug 2005 17:44:25 -0000 1.1.1.1 --- OSMThemeConstraintsComponent.java 3 Apr 2008 22:22:59 -0000 1.2 *************** *** 28,32 **** * <p>Description : To display constraint in theme editor</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author TD * @version 1.0 --- 28,32 ---- * <p>Description : To display constraint in theme editor</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author TD * @version 1.0 *************** *** 142,146 **** * <p>Description : A label with underline capability</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author TD * @version 1.0 --- 142,146 ---- * <p>Description : A label with underline capability</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author TD * @version 1.0 Index: OSMThemeMediasConstraintsComponent.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/themeeditor/themecomponent/OSMThemeMediasConstraintsComponent.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMThemeMediasConstraintsComponent.java 30 Aug 2005 17:44:26 -0000 1.1.1.1 --- OSMThemeMediasConstraintsComponent.java 3 Apr 2008 22:22:59 -0000 1.2 *************** *** 28,32 **** * <p>Description : To diplay constraint for medias in theme editor</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author TD * @version 1.0 --- 28,32 ---- * <p>Description : To diplay constraint for medias in theme editor</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author TD * @version 1.0 *************** *** 151,155 **** * <p>Description : A label with underline capability</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author TD * @version 1.0 --- 151,155 ---- * <p>Description : A label with underline capability</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author TD * @version 1.0 Index: OSMThemeBackGroundComponent.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/themeeditor/themecomponent/OSMThemeBackGroundComponent.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMThemeBackGroundComponent.java 30 Aug 2005 17:44:25 -0000 1.1.1.1 --- OSMThemeBackGroundComponent.java 3 Apr 2008 22:22:59 -0000 1.2 *************** *** 26,30 **** * <p>Description : represents the background component</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author non attribuable * @version 1.0 --- 26,30 ---- * <p>Description : represents the background component</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author non attribuable * @version 1.0 |
|
From: Olivier G. <og...@us...> - 2008-04-03 22:22:55
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/export In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6408/src/osmose/application/export Modified Files: OSMExportHTML.java Log Message: Conversion to UTF8 encoding Index: OSMExportHTML.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/export/OSMExportHTML.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** OSMExportHTML.java 17 Feb 2008 22:11:51 -0000 1.7 --- OSMExportHTML.java 3 Apr 2008 22:22:59 -0000 1.8 *************** *** 39,43 **** * <p>Description : Generate the export to HTML file of the presentation</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Sociéte : Quadrille Ingenierie</p> * @author non attribuable * @version 1.0 --- 39,43 ---- * <p>Description : Generate the export to HTML file of the presentation</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Sociéte : Quadrille Ingenierie</p> * @author non attribuable * @version 1.0 *************** *** 1266,1270 **** /** ! * it transforms specific caracters (for instance : é to é) * to be properly display in a html browser * @param str the string to be converted --- 1266,1270 ---- /** ! * it transforms specific caracters (for instance : é to é) * to be properly display in a html browser * @param str the string to be converted *************** *** 1360,1427 **** // conversation table for HTML m_ConversionTableHTML = new Hashtable(); ! m_ConversionTableHTML.put(new String("Æ"), new String("Æ")); ! m_ConversionTableHTML.put(new String("Á"), new String("Á")); ! m_ConversionTableHTML.put(new String("Â"), new String("Â")); ! m_ConversionTableHTML.put(new String("À"), new String("À")); ! m_ConversionTableHTML.put(new String("Å"), new String("Å")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ã")); ! m_ConversionTableHTML.put(new String("Ä"), new String("Ä")); ! m_ConversionTableHTML.put(new String("Ç"), new String("Ç")); ! m_ConversionTableHTML.put(new String("Ð"), new String("Ð")); ! m_ConversionTableHTML.put(new String("É"), new String("É")); ! m_ConversionTableHTML.put(new String("Ê"), new String("Ê")); ! m_ConversionTableHTML.put(new String("È"), new String("È")); ! m_ConversionTableHTML.put(new String("Ë"), new String("Ë")); ! m_ConversionTableHTML.put(new String("Í"), new String("Í")); ! m_ConversionTableHTML.put(new String("Î"), new String("Î")); ! m_ConversionTableHTML.put(new String("Ì"), new String("Ì")); ! m_ConversionTableHTML.put(new String("Ï"), new String("Ï")); ! m_ConversionTableHTML.put(new String("Ñ"), new String("Ñ")); ! m_ConversionTableHTML.put(new String("Ó"), new String("Ó")); ! m_ConversionTableHTML.put(new String("Ô"), new String("Ô")); ! m_ConversionTableHTML.put(new String("Ò"), new String("Ò")); ! m_ConversionTableHTML.put(new String("Ø"), new String("Ø")); ! m_ConversionTableHTML.put(new String("Õ"), new String("Õ")); ! m_ConversionTableHTML.put(new String("Ö"), new String("Ö")); ! m_ConversionTableHTML.put(new String("Þ"), new String("Þ")); ! m_ConversionTableHTML.put(new String("Ú"), new String("Ú")); ! m_ConversionTableHTML.put(new String("Û"), new String("Û")); ! m_ConversionTableHTML.put(new String("Ù"), new String("Ù")); ! m_ConversionTableHTML.put(new String("Ü"), new String("Ü")); ! m_ConversionTableHTML.put(new String("Ý"), new String("Ý")); ! m_ConversionTableHTML.put(new String("á"), new String("á")); ! m_ConversionTableHTML.put(new String("â"), new String("â")); ! m_ConversionTableHTML.put(new String("æ"), new String("æ")); ! m_ConversionTableHTML.put(new String("à"), new String("à")); ! m_ConversionTableHTML.put(new String("å"), new String("å")); ! m_ConversionTableHTML.put(new String("ã"), new String("ã")); ! m_ConversionTableHTML.put(new String("ä"), new String("ä")); ! m_ConversionTableHTML.put(new String("ç"), new String("ç")); ! m_ConversionTableHTML.put(new String("é"), new String("é")); ! m_ConversionTableHTML.put(new String("ê"), new String("ê")); ! m_ConversionTableHTML.put(new String("è"), new String("è")); ! m_ConversionTableHTML.put(new String("ð"), new String("ð")); ! m_ConversionTableHTML.put(new String("ë"), new String("ë")); ! m_ConversionTableHTML.put(new String("í"), new String("í")); ! m_ConversionTableHTML.put(new String("î"), new String("î")); ! m_ConversionTableHTML.put(new String("ì"), new String("ì")); ! m_ConversionTableHTML.put(new String("ï"), new String("ï")); ! m_ConversionTableHTML.put(new String("ñ"), new String("ñ")); ! m_ConversionTableHTML.put(new String("ó"), new String("ó")); ! m_ConversionTableHTML.put(new String("ô"), new String("ô")); ! m_ConversionTableHTML.put(new String("ò"), new String("ò")); ! m_ConversionTableHTML.put(new String("ø"), new String("ø")); ! m_ConversionTableHTML.put(new String("õ"), new String("õ")); ! m_ConversionTableHTML.put(new String("ö"), new String("ö")); ! m_ConversionTableHTML.put(new String("ß"), new String("ß")); ! m_ConversionTableHTML.put(new String("þ"), new String("þ")); ! m_ConversionTableHTML.put(new String("ú"), new String("ú")); ! m_ConversionTableHTML.put(new String("û"), new String("û")); ! m_ConversionTableHTML.put(new String("ù"), new String("ù")); ! m_ConversionTableHTML.put(new String("ü"), new String("ü")); ! m_ConversionTableHTML.put(new String("ý"), new String("ý")); ! m_ConversionTableHTML.put(new String("ÿ"), new String("ÿ")); m_ConversionTableHTML.put(new String("\n"), new String("<BR>")); ! m_ConversionTableHTML.put(new String(""), new String("€")); m_ConversionTableHTML.put(new String("<"), new String("<")); m_ConversionTableHTML.put(new String(">"), new String(">")); --- 1360,1427 ---- // conversation table for HTML m_ConversionTableHTML = new Hashtable(); ! m_ConversionTableHTML.put(new String("Ã"), new String("Æ")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Á")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Â")); ! m_ConversionTableHTML.put(new String("Ã"), new String("À")); ! m_ConversionTableHTML.put(new String("à "), new String("Å")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ã")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ä")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ç")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ð")); ! m_ConversionTableHTML.put(new String("Ã"), new String("É")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ê")); ! m_ConversionTableHTML.put(new String("Ã"), new String("È")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ë")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Í")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Î")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ì")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ï")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ñ")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ó")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ô")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ò")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ø")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Õ")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ö")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Þ")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ú")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Û")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ù")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ü")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ý")); ! m_ConversionTableHTML.put(new String("á"), new String("á")); ! m_ConversionTableHTML.put(new String("â"), new String("â")); ! m_ConversionTableHTML.put(new String("æ"), new String("æ")); ! m_ConversionTableHTML.put(new String("à "), new String("à")); ! m_ConversionTableHTML.put(new String("Ã¥"), new String("å")); ! m_ConversionTableHTML.put(new String("ã"), new String("ã")); ! m_ConversionTableHTML.put(new String("ä"), new String("ä")); ! m_ConversionTableHTML.put(new String("ç"), new String("ç")); ! m_ConversionTableHTML.put(new String("é"), new String("é")); ! m_ConversionTableHTML.put(new String("ê"), new String("ê")); ! m_ConversionTableHTML.put(new String("è"), new String("è")); ! m_ConversionTableHTML.put(new String("ð"), new String("ð")); ! m_ConversionTableHTML.put(new String("ë"), new String("ë")); ! m_ConversionTableHTML.put(new String("Ã"), new String("í")); ! m_ConversionTableHTML.put(new String("î"), new String("î")); ! m_ConversionTableHTML.put(new String("ì"), new String("ì")); ! m_ConversionTableHTML.put(new String("ï"), new String("ï")); ! m_ConversionTableHTML.put(new String("ñ"), new String("ñ")); ! m_ConversionTableHTML.put(new String("ó"), new String("ó")); ! m_ConversionTableHTML.put(new String("ô"), new String("ô")); ! m_ConversionTableHTML.put(new String("ò"), new String("ò")); ! m_ConversionTableHTML.put(new String("ø"), new String("ø")); ! m_ConversionTableHTML.put(new String("õ"), new String("õ")); ! m_ConversionTableHTML.put(new String("ö"), new String("ö")); ! m_ConversionTableHTML.put(new String("Ã"), new String("ß")); ! m_ConversionTableHTML.put(new String("þ"), new String("þ")); ! m_ConversionTableHTML.put(new String("ú"), new String("ú")); ! m_ConversionTableHTML.put(new String("û"), new String("û")); ! m_ConversionTableHTML.put(new String("ù"), new String("ù")); ! m_ConversionTableHTML.put(new String("ü"), new String("ü")); ! m_ConversionTableHTML.put(new String("ý"), new String("ý")); ! m_ConversionTableHTML.put(new String("ÿ"), new String("ÿ")); m_ConversionTableHTML.put(new String("\n"), new String("<BR>")); ! m_ConversionTableHTML.put(new String("Â"), new String("€")); m_ConversionTableHTML.put(new String("<"), new String("<")); m_ConversionTableHTML.put(new String(">"), new String(">")); *************** *** 1431,1458 **** // conversion table for path (directory without accent) m_ConversionTablePath = new Hashtable(); ! m_ConversionTablePath.put(new String("á"), new String("a")); ! m_ConversionTablePath.put(new String("â"), new String("a")); ! m_ConversionTablePath.put(new String("à"), new String("a")); ! m_ConversionTablePath.put(new String("å"), new String("a")); ! m_ConversionTablePath.put(new String("ã"), new String("a")); ! m_ConversionTablePath.put(new String("ä"), new String("a")); ! m_ConversionTablePath.put(new String("ç"), new String("c")); ! m_ConversionTablePath.put(new String("é"), new String("e")); ! m_ConversionTablePath.put(new String("ê"), new String("e")); ! m_ConversionTablePath.put(new String("è"), new String("e")); ! m_ConversionTablePath.put(new String("ë"), new String("e")); ! m_ConversionTablePath.put(new String("í"), new String("i")); ! m_ConversionTablePath.put(new String("î"), new String("i")); ! m_ConversionTablePath.put(new String("ì"), new String("i")); ! m_ConversionTablePath.put(new String("ï"), new String("i")); ! m_ConversionTablePath.put(new String("ó"), new String("o")); ! m_ConversionTablePath.put(new String("ô"), new String("o")); ! m_ConversionTablePath.put(new String("ò"), new String("o")); ! m_ConversionTablePath.put(new String("õ"), new String("o")); ! m_ConversionTablePath.put(new String("ö"), new String("o")); ! m_ConversionTablePath.put(new String("ú"), new String("u")); ! m_ConversionTablePath.put(new String("û"), new String("u")); ! m_ConversionTablePath.put(new String("ù"), new String("u")); ! m_ConversionTablePath.put(new String("ü"), new String("u")); } --- 1431,1458 ---- // conversion table for path (directory without accent) m_ConversionTablePath = new Hashtable(); ! m_ConversionTablePath.put(new String("á"), new String("a")); ! m_ConversionTablePath.put(new String("â"), new String("a")); ! m_ConversionTablePath.put(new String("à "), new String("a")); ! m_ConversionTablePath.put(new String("Ã¥"), new String("a")); ! m_ConversionTablePath.put(new String("ã"), new String("a")); ! m_ConversionTablePath.put(new String("ä"), new String("a")); ! m_ConversionTablePath.put(new String("ç"), new String("c")); ! m_ConversionTablePath.put(new String("é"), new String("e")); ! m_ConversionTablePath.put(new String("ê"), new String("e")); ! m_ConversionTablePath.put(new String("è"), new String("e")); ! m_ConversionTablePath.put(new String("ë"), new String("e")); ! m_ConversionTablePath.put(new String("Ã"), new String("i")); ! m_ConversionTablePath.put(new String("î"), new String("i")); ! m_ConversionTablePath.put(new String("ì"), new String("i")); ! m_ConversionTablePath.put(new String("ï"), new String("i")); ! m_ConversionTablePath.put(new String("ó"), new String("o")); ! m_ConversionTablePath.put(new String("ô"), new String("o")); ! m_ConversionTablePath.put(new String("ò"), new String("o")); ! m_ConversionTablePath.put(new String("õ"), new String("o")); ! m_ConversionTablePath.put(new String("ö"), new String("o")); ! m_ConversionTablePath.put(new String("ú"), new String("u")); ! m_ConversionTablePath.put(new String("û"), new String("u")); ! m_ConversionTablePath.put(new String("ù"), new String("u")); ! m_ConversionTablePath.put(new String("ü"), new String("u")); } |
|
From: Olivier G. <og...@us...> - 2008-04-03 22:22:54
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/draw/notification In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6408/src/osmose/application/draw/notification Modified Files: OSMDrawingListener.java OSMDrawingEvent.java OSMDrawingNotifier.java Log Message: Conversion to UTF8 encoding Index: OSMDrawingListener.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/draw/notification/OSMDrawingListener.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMDrawingListener.java 30 Aug 2005 17:44:12 -0000 1.1.1.1 --- OSMDrawingListener.java 3 Apr 2008 22:22:58 -0000 1.2 *************** *** 23,27 **** * <p>Description : Interface for the tree editor events listeners.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 23,27 ---- * <p>Description : Interface for the tree editor events listeners.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 Index: OSMDrawingNotifier.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/draw/notification/OSMDrawingNotifier.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMDrawingNotifier.java 30 Aug 2005 17:44:13 -0000 1.1.1.1 --- OSMDrawingNotifier.java 3 Apr 2008 22:22:59 -0000 1.2 *************** *** 24,28 **** * <p>Description : Notifier of tree editor event.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 24,28 ---- * <p>Description : Notifier of tree editor event.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 Index: OSMDrawingEvent.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/draw/notification/OSMDrawingEvent.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMDrawingEvent.java 30 Aug 2005 17:44:12 -0000 1.1.1.1 --- OSMDrawingEvent.java 3 Apr 2008 22:22:59 -0000 1.2 *************** *** 23,27 **** * <p>Description : Event from the image editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 23,27 ---- * <p>Description : Event from the image editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 |
|
From: Olivier G. <og...@us...> - 2008-04-03 22:22:54
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/data/page In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6408/src/osmose/application/data/page Modified Files: OSMPageItemProperties.java Log Message: Conversion to UTF8 encoding Index: OSMPageItemProperties.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/data/page/OSMPageItemProperties.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMPageItemProperties.java 30 Aug 2005 17:44:05 -0000 1.1.1.1 --- OSMPageItemProperties.java 3 Apr 2008 22:22:59 -0000 1.2 *************** *** 23,27 **** * Properties are size and position.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 23,27 ---- * Properties are size and position.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 |
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6408/src/osmose/application/common/slidecomponent Modified Files: OSMSlideBodyLine.java OSMSlideTitle.java OSMSlideNumber.java OSMSlideVidComponent.java OSMSlideMediaImg.java OSMSlideMedias.java OSMSlideImgComponent.java OSMSlideMediaVideoViewer.java OSMSlideMediaVid.java OSMSlideComponent.java OSMSlideBody.java OSMSlideTxtComponent.java OSMSlideMediaTxt.java OSMSlideRtfComponent.java Log Message: Conversion to UTF8 encoding Index: OSMSlideBodyLine.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent/OSMSlideBodyLine.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMSlideBodyLine.java 30 Aug 2005 17:44:01 -0000 1.1.1.1 --- OSMSlideBodyLine.java 3 Apr 2008 22:22:58 -0000 1.2 *************** *** 27,31 **** * <p>Description : Line of the body in the slide editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 27,31 ---- * <p>Description : Line of the body in the slide editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 Index: OSMSlideMediaVideoViewer.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent/OSMSlideMediaVideoViewer.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMSlideMediaVideoViewer.java 30 Aug 2005 17:44:02 -0000 1.1.1.1 --- OSMSlideMediaVideoViewer.java 3 Apr 2008 22:22:58 -0000 1.2 *************** *** 28,32 **** * <p>Description : To display a video in viewer.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author TD * @version 1.0 --- 28,32 ---- * <p>Description : To display a video in viewer.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author TD * @version 1.0 Index: OSMSlideMediaVid.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent/OSMSlideMediaVid.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMSlideMediaVid.java 30 Aug 2005 17:44:02 -0000 1.1.1.1 --- OSMSlideMediaVid.java 3 Apr 2008 22:22:58 -0000 1.2 *************** *** 27,31 **** * draw image associated with element.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 27,31 ---- * draw image associated with element.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 Index: OSMSlideImgComponent.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent/OSMSlideImgComponent.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMSlideImgComponent.java 30 Aug 2005 17:44:02 -0000 1.1.1.1 --- OSMSlideImgComponent.java 3 Apr 2008 22:22:58 -0000 1.2 *************** *** 26,30 **** * an OSMSlideEditorPanel panel.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 26,30 ---- * an OSMSlideEditorPanel panel.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 Index: OSMSlideTitle.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent/OSMSlideTitle.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMSlideTitle.java 30 Aug 2005 17:44:02 -0000 1.1.1.1 --- OSMSlideTitle.java 3 Apr 2008 22:22:58 -0000 1.2 *************** *** 25,29 **** * <p>Description : This class represents the title in the slide editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : OH,TD * @version 1.0 --- 25,29 ---- * <p>Description : This class represents the title in the slide editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : OH,TD * @version 1.0 Index: OSMSlideBody.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent/OSMSlideBody.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMSlideBody.java 17 Feb 2008 22:11:50 -0000 1.2 --- OSMSlideBody.java 3 Apr 2008 22:22:58 -0000 1.3 *************** *** 32,36 **** * This class manage a list of OSMSlideBodyLine.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 32,36 ---- * This class manage a list of OSMSlideBodyLine.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 Index: OSMSlideRtfComponent.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent/OSMSlideRtfComponent.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMSlideRtfComponent.java 3 Oct 2007 21:31:13 -0000 1.2 --- OSMSlideRtfComponent.java 3 Apr 2008 22:22:58 -0000 1.3 *************** *** 21,25 **** * <p>Description : A generic rich text component in slide editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : OB * @version 1.0 --- 21,25 ---- * <p>Description : A generic rich text component in slide editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : OB * @version 1.0 Index: OSMSlideVidComponent.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent/OSMSlideVidComponent.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMSlideVidComponent.java 30 Aug 2005 17:44:03 -0000 1.1.1.1 --- OSMSlideVidComponent.java 3 Apr 2008 22:22:58 -0000 1.2 *************** *** 28,32 **** * an OSMSlideEditorPanel panel.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 28,32 ---- * an OSMSlideEditorPanel panel.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 Index: OSMSlideTxtComponent.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent/OSMSlideTxtComponent.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OSMSlideTxtComponent.java 17 Feb 2008 22:11:50 -0000 1.3 --- OSMSlideTxtComponent.java 3 Apr 2008 22:22:58 -0000 1.4 *************** *** 26,30 **** * <p>Description : This class is used to draw text in the slide editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD, OH * @version 1.0 --- 26,30 ---- * <p>Description : This class is used to draw text in the slide editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD, OH * @version 1.0 Index: OSMSlideMediaImg.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent/OSMSlideMediaImg.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMSlideMediaImg.java 30 Aug 2005 17:44:02 -0000 1.1.1.1 --- OSMSlideMediaImg.java 3 Apr 2008 22:22:58 -0000 1.2 *************** *** 28,32 **** * draw image associated with element.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 28,32 ---- * draw image associated with element.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 Index: OSMSlideMediaTxt.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent/OSMSlideMediaTxt.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMSlideMediaTxt.java 30 Aug 2005 17:44:02 -0000 1.1.1.1 --- OSMSlideMediaTxt.java 3 Apr 2008 22:22:58 -0000 1.2 *************** *** 31,35 **** * <p>Description : A text media in slide editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 31,35 ---- * <p>Description : A text media in slide editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 Index: OSMSlideMedias.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent/OSMSlideMedias.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMSlideMedias.java 30 Aug 2005 17:44:02 -0000 1.1.1.1 --- OSMSlideMedias.java 3 Apr 2008 22:22:58 -0000 1.2 *************** *** 27,31 **** * <p>Description : This class manage the media in the slide editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 27,31 ---- * <p>Description : This class manage the media in the slide editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 Index: OSMSlideNumber.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent/OSMSlideNumber.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMSlideNumber.java 30 Aug 2005 17:44:02 -0000 1.1.1.1 --- OSMSlideNumber.java 3 Apr 2008 22:22:58 -0000 1.2 *************** *** 24,28 **** * <p>Description : This class represents the number in the slide editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : OH,TD * @version 1.0 --- 24,28 ---- * <p>Description : This class represents the number in the slide editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : OH,TD * @version 1.0 Index: OSMSlideComponent.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent/OSMSlideComponent.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMSlideComponent.java 30 Aug 2005 17:44:02 -0000 1.1.1.1 --- OSMSlideComponent.java 3 Apr 2008 22:22:58 -0000 1.2 *************** *** 28,32 **** * <p>Description : Generic component of the slide editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 28,32 ---- * <p>Description : Generic component of the slide editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 |
|
From: Olivier G. <og...@us...> - 2008-04-03 22:22:54
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/documenteditor/notification In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6408/src/osmose/application/documenteditor/notification Modified Files: OSMTreeEditorListener.java OSMTreeEditorEvent.java OSMTreeEditorNotifier.java Log Message: Conversion to UTF8 encoding Index: OSMTreeEditorEvent.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/documenteditor/notification/OSMTreeEditorEvent.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMTreeEditorEvent.java 30 Aug 2005 17:44:11 -0000 1.1.1.1 --- OSMTreeEditorEvent.java 3 Apr 2008 22:22:58 -0000 1.2 *************** *** 24,28 **** * <p>Description : Event from the tree editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 24,28 ---- * <p>Description : Event from the tree editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 Index: OSMTreeEditorListener.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/documenteditor/notification/OSMTreeEditorListener.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMTreeEditorListener.java 30 Aug 2005 17:44:11 -0000 1.1.1.1 --- OSMTreeEditorListener.java 3 Apr 2008 22:22:58 -0000 1.2 *************** *** 23,27 **** * <p>Description : Interface for the tree editor events listeners.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 23,27 ---- * <p>Description : Interface for the tree editor events listeners.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 Index: OSMTreeEditorNotifier.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/documenteditor/notification/OSMTreeEditorNotifier.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMTreeEditorNotifier.java 30 Aug 2005 17:44:11 -0000 1.1.1.1 --- OSMTreeEditorNotifier.java 3 Apr 2008 22:22:58 -0000 1.2 *************** *** 25,29 **** * <p>Description : Notifier of tree editor event.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 25,29 ---- * <p>Description : Notifier of tree editor event.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 |
|
From: Olivier G. <og...@us...> - 2008-04-03 22:22:53
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/dialog In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6408/src/osmose/application/dialog Modified Files: OSMDialogApplicationPreferences.java Log Message: Conversion to UTF8 encoding Index: OSMDialogApplicationPreferences.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/dialog/OSMDialogApplicationPreferences.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** OSMDialogApplicationPreferences.java 3 Apr 2008 20:38:41 -0000 1.4 --- OSMDialogApplicationPreferences.java 3 Apr 2008 22:22:58 -0000 1.5 *************** *** 118,122 **** m_Languages = new Hashtable(); m_Languages.put("English", "en_US"); ! m_Languages.put("Français", "fr_FR"); /** --- 118,122 ---- m_Languages = new Hashtable(); m_Languages.put("English", "en_US"); ! m_Languages.put("Français", "fr_FR"); /** |
|
From: Olivier G. <og...@us...> - 2008-04-03 22:22:53
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/menucommand In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6408/src/osmose/application/menucommand Modified Files: OSMMenuFileClose.java OSMMenuFileInsert.java Log Message: Conversion to UTF8 encoding Index: OSMMenuFileInsert.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/menucommand/OSMMenuFileInsert.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMMenuFileInsert.java 3 Oct 2007 21:31:15 -0000 1.2 --- OSMMenuFileInsert.java 3 Apr 2008 22:22:58 -0000 1.3 *************** *** 31,35 **** * <p>Description : Represent an insert file menu action.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Sociéte : Quadrille Ingenierie</p> * @author : TD * @version 1.0 --- 31,35 ---- * <p>Description : Represent an insert file menu action.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Sociéte : Quadrille Ingenierie</p> * @author : TD * @version 1.0 Index: OSMMenuFileClose.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/menucommand/OSMMenuFileClose.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMMenuFileClose.java 30 Aug 2005 17:44:18 -0000 1.1.1.1 --- OSMMenuFileClose.java 3 Apr 2008 22:22:58 -0000 1.2 *************** *** 24,28 **** * <p>Description : Represent a close file menu action.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 24,28 ---- * <p>Description : Represent a close file menu action.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 |
|
From: Olivier G. <og...@us...> - 2008-04-03 20:38:37
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31107/src/osmose/application Modified Files: OSMApplication.java Log Message: Language switching (feature request #1359770) Index: OSMApplication.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/OSMApplication.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OSMApplication.java 6 Jul 2006 15:03:44 -0000 1.3 --- OSMApplication.java 3 Apr 2008 20:38:41 -0000 1.4 *************** *** 28,31 **** --- 28,32 ---- import osmose.application.slideeditor.*; import osmose.application.undoredo.*; + import osmose.application.user.OSMUser; *************** *** 34,38 **** * <p>Description : main class of OSMOSE application</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author non attribuable * @version 1.0 --- 35,39 ---- * <p>Description : main class of OSMOSE application</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Soci�t� : </p> * @author non attribuable * @version 1.0 *************** *** 76,80 **** boolean bLoadLocalOk = false; try { ! Locale currentLocale = new Locale(language, country); Localisation = (ResourceBundle)ResourceBundle.getBundle("osmose_local", currentLocale); bLoadLocalOk = true; --- 77,83 ---- boolean bLoadLocalOk = false; try { ! String userLanguage = (String)OSMUser.USER.getProperty("language.default", OSMApplication.Properties.getStringProp("OSM_Language")+"_"+OSMApplication.Properties.getStringProp("OSM_Country")); ! String[] lang = userLanguage.split("_"); ! Locale currentLocale = new Locale(lang[0], lang[1]); Localisation = (ResourceBundle)ResourceBundle.getBundle("osmose_local", currentLocale); bLoadLocalOk = true; *************** *** 198,202 **** } else { ! OSMFatalError fe = new OSMFatalError("Erreur de lecture des fichiers de propriétés.", "Error reading properties files."); fe.showDialogAndExit(); } --- 201,205 ---- } else { ! OSMFatalError fe = new OSMFatalError("Erreur de lecture des fichiers de propri�t�s.", "Error reading properties files."); fe.showDialogAndExit(); } *************** *** 426,430 **** * <p>Description : This class is use to display a fatal error and exit.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author TD * @version 1.0 --- 429,433 ---- * <p>Description : This class is use to display a fatal error and exit.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Soci�t� : </p> * @author TD * @version 1.0 |
|
From: Olivier G. <og...@us...> - 2008-04-03 20:38:37
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/dialog In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31107/src/osmose/application/dialog Modified Files: OSMDialogApplicationPreferences.java Log Message: Language switching (feature request #1359770) Index: OSMDialogApplicationPreferences.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/dialog/OSMDialogApplicationPreferences.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OSMDialogApplicationPreferences.java 3 Oct 2007 21:31:14 -0000 1.3 --- OSMDialogApplicationPreferences.java 3 Apr 2008 20:38:41 -0000 1.4 *************** *** 84,87 **** --- 84,88 ---- m_AppDefaultMedia = ((Integer)OSMUser.USER.getProperty("media.default", new Integer(OSMApplication.Properties.getIntProp("OSM_DefaultMedia")))).intValue(); m_AppBrowser = (File)OSMUser.USER.getProperty("browser", new File(OSMApplication.Properties.getStringProp("OSM_Browser"))); + m_AppDefaultLanguage = (String)OSMUser.USER.getProperty("language.default", OSMApplication.Properties.getStringProp("OSM_Language")+"_"+OSMApplication.Properties.getStringProp("OSM_Country")); m_LabelAuthor = (String)OSMUser.USER.getProperty("labels.author", OSMApplication.Localisation.getString("OSM_LabelsAuthor")); m_LabelVersion = (String)OSMUser.USER.getProperty("labels.version", OSMApplication.Localisation.getString("OSM_LabelsVersion")); *************** *** 113,117 **** // m_MediaType2.put(new Integer(OSMMedia.TYPE_RTF), "Texte Riche"); m_MediaType2.put(new Integer(OSMMedia.TYPE_VID), OSMApplication.Localisation.getString("PRE_MediaVid")); ! /** --- 114,122 ---- // m_MediaType2.put(new Integer(OSMMedia.TYPE_RTF), "Texte Riche"); m_MediaType2.put(new Integer(OSMMedia.TYPE_VID), OSMApplication.Localisation.getString("PRE_MediaVid")); ! ! // available languages ! m_Languages = new Hashtable(); ! m_Languages.put("English", "en_US"); ! m_Languages.put("Français", "fr_FR"); /** *************** *** 403,406 **** --- 408,444 ---- pApp.add(eltPanel, new Rectangle(0, 5, 1, 2)); + /** + * APPLICATION => Language. + */ + JPanel pLanguage = new JPanel(); + pLanguage.setLayout(new OSMGraphPaperLayout(new Dimension(3, 2), 1, 1)); + JLabel lLanguageDefault1 = new JLabel(OSMApplication.Localisation.getString("DAP_TabAppLabelDefaultLanguage1")); + JLabel lLanguageDefault2 = new JLabel(OSMApplication.Localisation.getString("DAP_TabAppLabelDefaultLanguage2")); + JPanel plLanguage = new JPanel(); + plLanguage.setLayout(new FlowLayout(FlowLayout.LEFT)); + plLanguage.add(lLanguageDefault1); + plLanguage.add(lLanguageDefault2); + pLanguage.add(plLanguage, new Rectangle(0, 0, 2, 1)); + final JComboBox cbLanguage = new JComboBox(); + for(Enumeration enumer = m_Languages.keys();enumer.hasMoreElements();) + cbLanguage.addItem(enumer.nextElement()); + cbLanguage.addKeyListener(this); + JPanel pcbLanguage = new JPanel(); + pcbLanguage.setLayout(new FlowLayout(FlowLayout.RIGHT)); + pcbLanguage.add(cbLanguage); + pLanguage.add(pcbLanguage, new Rectangle(2, 0, 1, 1)); + cbLanguage.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + m_AppDefaultLanguage = (String)m_Languages.get((String)cbLanguage.getSelectedItem()); + } + }); + Iterator entries = m_Languages.entrySet().iterator(); + while (entries.hasNext()) { + Map.Entry entry = (Map.Entry)entries.next(); + if (entry.getValue().equals(m_AppDefaultLanguage)) { + cbLanguage.setSelectedItem(entry.getKey()); + } + } + pApp.add(pLanguage, new Rectangle(0, 7, 1, 3)); /** *************** *** 525,528 **** --- 563,567 ---- OSMUser.USER.setProperty("labels.version", m_LabelVersion); OSMUser.USER.setProperty("labels.htmltitle", m_LabelHTMLTitle); + OSMUser.USER.setProperty("language.default", m_AppDefaultLanguage); *************** *** 586,589 **** --- 625,630 ---- private JSpinner m_EltSize; private JSpinner m_EltMaxSize; + private String m_AppDefaultLanguage; + private Hashtable m_Languages; private boolean isSaved; |
|
From: Olivier G. <og...@us...> - 2008-04-03 20:38:37
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/user In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31107/src/osmose/application/user Modified Files: OSMUser.java Log Message: Language switching (feature request #1359770) Index: OSMUser.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/user/OSMUser.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMUser.java 3 Oct 2007 21:31:16 -0000 1.2 --- OSMUser.java 3 Apr 2008 20:38:41 -0000 1.3 *************** *** 100,103 **** --- 100,104 ---- * export.html.not.included => indicates whether html notes files are included in exportation * export.html.frame.included=> indicates whether html frames files are included in exportation + * language.default => string representing the locale to use (ex: en_US) * </pre> * |
|
From: Olivier G. <og...@us...> - 2008-04-03 20:38:37
|
Update of /cvsroot/osmose-dev/osmose/resources/localization In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31107/resources/localization Modified Files: osmose_local_en_US.properties osmose_local_fr_FR.properties Log Message: Language switching (feature request #1359770) Index: osmose_local_en_US.properties =================================================================== RCS file: /cvsroot/osmose-dev/osmose/resources/localization/osmose_local_en_US.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** osmose_local_en_US.properties 17 Feb 2008 22:11:49 -0000 1.5 --- osmose_local_en_US.properties 3 Apr 2008 20:38:41 -0000 1.6 *************** *** 215,218 **** --- 215,220 ---- DAP_PanelEltMax=Max DAP_PanelEltMin=Min + DAP_TabAppLabelDefaultLanguage1=Interface language + DAP_TabAppLabelDefaultLanguage2=(restart needed) DEX_FrameTitle=Export... Index: osmose_local_fr_FR.properties =================================================================== RCS file: /cvsroot/osmose-dev/osmose/resources/localization/osmose_local_fr_FR.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** osmose_local_fr_FR.properties 17 Feb 2008 22:11:50 -0000 1.4 --- osmose_local_fr_FR.properties 3 Apr 2008 20:38:41 -0000 1.5 *************** *** 207,210 **** --- 207,212 ---- DAP_PanelEltMax=Max DAP_PanelEltMin=Min + DAP_TabAppLabelDefaultLanguage1=Langue de l'interface + DAP_TabAppLabelDefaultLanguage2=(rédémarrage nécessaire) DEX_FrameTitle=Exporter... |
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 |
|
From: Olivier G. <og...@us...> - 2008-02-17 22:11:48
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/slideviewer In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6501/src/osmose/application/slideviewer Modified Files: OSMSlideViewer.java OSMSlideViewerPanel.java Log Message: Added choice for putting bullet lists in notes (by Fatimatou) Index: OSMSlideViewer.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/slideviewer/OSMSlideViewer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OSMSlideViewer.java 3 Oct 2007 21:31:16 -0000 1.3 --- OSMSlideViewer.java 17 Feb 2008 22:11:51 -0000 1.4 *************** *** 21,25 **** import osmose.application.common.*; import osmose.application.data.*; ! /** --- 21,25 ---- import osmose.application.common.*; import osmose.application.data.*; ! import javax.swing.*; /** *************** *** 40,52 **** public void begin2Draw() { ! ! // Get index of current page in slide editor ! OSMSlide currentSlide = OSMApplication.SlideEditor.getCurrentSlide(); ! if(currentSlide != null) ! m_Panel.goPage(m_Panel.getPageIndex(currentSlide) + 1); ! else ! m_Panel.goPage(1); ! } ! /** --- 40,69 ---- public void begin2Draw() { ! // Get index of current page in slide editor ! OSMSlide currentSlide = OSMApplication.SlideEditor.getCurrentSlide(); ! int numberScreen = getNumberScreen(); ! if(numberScreen==1){ ! if(currentSlide != null){ ! m_Panel.goPage(m_Panel.getPageIndex(currentSlide) + 1); ! } ! else ! m_Panel.goPage(1); ! } ! if(numberScreen==2){ ! if(currentSlide != null){ ! m_Panel.goPage(m_Panel.getPageIndex(currentSlide)+1); ! m_PanelNotes.goPageNotes(m_Panel.getPageIndex(currentSlide)+1); ! ! m_Panel1.goPage(m_Panel1.getPageIndex(currentSlide) + 1); ! m_frame1.setVisible(true); ! } ! else{ ! ! m_Panel.goPage(1); ! m_PanelNotes.goPageNotes(1); ! m_Panel1.goPage(1); ! } ! } ! } /** *************** *** 55,63 **** public void onFrameClosing() { ! m_Panel.endOfSlides(); } - /** * starts the viewer. Sets the display mode in fullscreen mode, and displays --- 72,84 ---- public void onFrameClosing() { ! int numberScreen = getNumberScreen(); ! if(numberScreen == 1)m_Panel.endOfSlides(); ! if(numberScreen== 2){ ! m_Panel.endOfSlides(); ! m_Panel1.endOfSlides(); ! } } /** * starts the viewer. Sets the display mode in fullscreen mode, and displays *************** *** 66,70 **** public void beginViewing() { - // Use OSMFullScreenFrame capabilities showInFullScreen(); --- 87,90 ---- *************** *** 91,159 **** */ public OSMSlideViewer(OSMDocument doc, boolean audioComments) { ! super(); ! ! ! /** ! * Initialization of members. ! */ ! Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); ! ! ! // On mac, show this in a 4/3 frame. ! if(System.getProperty("os.name").toLowerCase().startsWith("mac")) ! { ! GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment(); ! Rectangle bounds = env.getMaximumWindowBounds(); ! m_Height = bounds.height - 25;//Height minus window title bar height ! m_Width = (int)(m_Height * 4 / 3); ! } ! else ! { ! int h = (int)screenSize.getHeight(); ! int w = (int)screenSize.getWidth(); ! m_Height = (int)(w * 3 / 4); ! if(m_Height > h) ! { ! m_Height = h; ! m_Width = (int)(h * 4 / 3); ! } ! else ! { ! m_Width = w; ! } ! } ! ! ! // Create panel to view... ! m_Panel = new OSMSlideViewerPanel(this, doc, m_Width, m_Height); ! m_Panel.setFlagAudioComments(audioComments); ! m_Panel.setMinimumSize(new Dimension(m_Width, m_Height)); ! m_Panel.setMaximumSize(new Dimension(m_Width, m_Height)); ! m_Panel.setPreferredSize(new Dimension(m_Width, m_Height)); ! ! ! // Construction of the GUI. ! getContentPane().setLayout(new GridBagLayout()); ! GridBagConstraints c = new GridBagConstraints(); ! c.insets = new Insets(0, 0, 0, 0); ! c.gridx = 0; ! c.gridy = 0; ! c.gridwidth = 1; ! c.gridheight = 1; ! c.anchor = GridBagConstraints.CENTER; ! getContentPane().add(m_Panel, c); ! getContentPane().setBackground(Color.BLACK); ! getContentPane().setForeground(Color.BLACK); ! // listener listening for 'key pressed' to navigate. ! this.addKeyListener(new KeyAdapter() { ! public void keyPressed(KeyEvent e) { ! m_Panel.keyPressed(e); ! } ! }); ! } /** * stops the viewing of the presentation. Resets the display mode to windowed --- 111,306 ---- */ public OSMSlideViewer(OSMDocument doc, boolean audioComments) { ! super(); ! ! /** ! * Initialization of members. ! */ ! Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); ! // On mac, show this in a 4/3 frame. ! if(System.getProperty("os.name").toLowerCase().startsWith("mac")) ! { ! GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment(); ! Rectangle bounds = env.getMaximumWindowBounds(); ! m_Height = bounds.height - 25;//Height minus window title bar height ! m_Width = (int)(m_Height * 4 / 3); ! } ! else ! { ! int h = (int)screenSize.getHeight(); ! int w = (int)screenSize.getWidth(); ! m_Height = (int)(w * 3 / 4); ! if(m_Height > h) ! { ! m_Height = h; ! m_Width = (int)(h * 4 / 3); ! } ! else ! { ! m_Width = w; ! } ! } ! ! GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); ! GraphicsDevice[] gs = ge.getScreenDevices(); ! ! // Create panel to view... if there is only one screen ! if(gs.length==1){ ! m_Panel = new OSMSlideViewerPanel(this, doc, m_Width, m_Height,false); ! m_Panel.setFlagAudioComments(audioComments); ! m_Panel.setMinimumSize(new Dimension(m_Width, m_Height)); ! m_Panel.setMaximumSize(new Dimension(m_Width, m_Height)); ! m_Panel.setPreferredSize(new Dimension(m_Width, m_Height)); + // Construction of the GUI. + getContentPane().setLayout(new GridBagLayout()); + GridBagConstraints c = new GridBagConstraints(); + c.insets = new Insets(0, 0, 0, 0); + c.gridx = 0; + c.gridy = 0; + c.gridwidth = 1; + c.gridheight = 1; + c.anchor = GridBagConstraints.CENTER; + getContentPane().add(m_Panel, c); + getContentPane().setBackground(Color.BLACK); + getContentPane().setForeground(Color.BLACK); + // listener listening for 'key pressed' to navigate. + this.addKeyListener(new KeyAdapter() { + public void keyPressed(KeyEvent e) { + m_Panel.keyPressed(e); + } + }); + } + if(gs.length==2){ + Rectangle bounds = ge.getMaximumWindowBounds(); + m_Height = bounds.height; + m_Width = m_Height; + + //create The First Panel + m_Panel =new OSMSlideViewerPanel(this, doc, m_Width, m_Height*3/4,false); + m_Panel.setFlagAudioComments(audioComments); + m_Panel.setMinimumSize(new Dimension(m_Width, m_Height*3/4)); + m_Panel.setMaximumSize(new Dimension(m_Width, m_Height*3/4)); + m_Panel.setPreferredSize(new Dimension(m_Width, m_Height*3/4)); + + // Construction of the GUI. + getContentPane().setLayout(new GridBagLayout()); + GridBagConstraints c = new GridBagConstraints(); + c.insets = new Insets(0, 0, 0, 0); + c.gridx = 0; + c.gridy = 0; + c.gridwidth = 1; + c.gridheight = 1; + c.anchor = GridBagConstraints.CENTER; + + // listener listening for 'key pressed' to navigate. + this.addKeyListener(new KeyAdapter() { + public void keyPressed(KeyEvent e) { + m_Panel.keyPressed(e); + } + }); + + m_PanelNotes =new OSMSlideViewerPanel(this, doc, m_Width, m_Height/4,true); + m_PanelNotes.setFlagAudioComments(audioComments); + m_PanelNotes.setMinimumSize(new Dimension(m_Width, m_Height/4)); + m_PanelNotes.setMaximumSize(new Dimension(m_Width, m_Height/4)); + m_PanelNotes.setPreferredSize(new Dimension(m_Width, m_Height/4)); + + + + // listener listening for 'key pressed' to navigate. + this.addKeyListener(new KeyAdapter() { + public void keyPressed(KeyEvent e) { + m_PanelNotes.keyPressed(e); + } + }); + + //For the first frame + int h = (int)screenSize.getHeight(); + int w = (int)screenSize.getWidth(); + m_Height = (int)(w * 3 / 4); + if(m_Height > h) + { + m_Height = h; + m_Width = (int)(h * 4 / 3); + } + else + { + m_Width = w; + } + + GraphicsDevice gd = gs[0]; + m_frame = new JFrame(gd.getConfigurations()[0]); + m_frame.setLayout(new BorderLayout()); + m_frame.getContentPane().add(m_Panel, BorderLayout.NORTH); + m_frame.getContentPane().add(m_PanelNotes); + m_frame.setMinimumSize(new Dimension(m_Width, m_Height)); + m_frame.setMaximumSize(new Dimension(m_Width, m_Height)); + m_frame.setPreferredSize(new Dimension(m_Width, m_Height)); + m_frame.setUndecorated(true); + m_frame.setFocusable(true); + m_frame.setAlwaysOnTop(true); + m_frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); + m_frame.setVisible(true); + m_win = new JWindow(m_frame); + gd.setFullScreenWindow(m_win); + + // The second Screen + GraphicsDevice gd1 = gs[1]; + GraphicsConfiguration gc1 = gd1.getDefaultConfiguration(); + Rectangle bounds1 = gc1.getBounds(); + int h2 = (int)bounds1.getHeight(); + int w2 = (int)bounds1.getWidth(); + + m_Height2 = (int)(w2 * 3 / 4); + if(m_Height2 > h2) + { + m_Height2 = h2; + m_Width2 = (int)(h2 * 4 / 3); + } + else + { + m_Width2 = w2; + } + + m_Panel1 =new OSMSlideViewerPanel(this, doc, m_Width2, m_Height2,false); + m_Panel1.setFlagAudioComments(audioComments); + m_Panel1.setMinimumSize(new Dimension(m_Width2, m_Height2)); + m_Panel1.setMaximumSize(new Dimension(m_Width2, m_Height2)); + m_Panel1.setPreferredSize(new Dimension(m_Width2, m_Height2)); + + + // Construction of the GUI : the same as the first + + // listener listening for 'key pressed' to navigate. + this.addKeyListener(new KeyAdapter() { + public void keyPressed(KeyEvent e) { + m_Panel1.keyPressed(e); + } + }); + + // For the second frame + ; + m_frame1 = new JFrame(gd1.getConfigurations()[0]); + FlowLayout bl=new FlowLayout(FlowLayout.CENTER); + m_frame1.setLayout(bl); + m_frame1.getContentPane().add(m_Panel1); + m_frame1.getContentPane().setBackground(Color.BLACK); + m_frame1.getContentPane().setForeground(Color.BLACK); + m_frame1.setMinimumSize(new Dimension(w2,h2)); + m_frame1.setMaximumSize(new Dimension(w2,h2)); + m_frame1.setPreferredSize(new Dimension(w2,h2)); + m_frame1.setUndecorated(true); + m_frame1.setFocusable(true); + m_frame1.setAlwaysOnTop(true); + m_frame1.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); + m_frame1.setVisible(true); + m_win1 = new JWindow(m_frame1); + gd1.setFullScreenWindow(m_win1); + } + } + /** * stops the viewing of the presentation. Resets the display mode to windowed *************** *** 165,180 **** */ protected void endViewing() { - - // Return to normal mode returnFromFullScreen(); } /** ! * main panel of the frame containing all the components to display. */ private OSMSlideViewerPanel m_Panel; /** --- 312,394 ---- */ protected void endViewing() { // Return to normal mode returnFromFullScreen(); + int numberScreen = getNumberScreen(); + if(numberScreen==2){ + m_frame.hide(); + m_frame1.hide(); + m_win.hide(); + m_win1.hide(); + } + } + + /** + * @return the main panel of the frame containing all the components to display + * in the second screen + */ + public OSMSlideViewerPanel getPanel1(){ + return m_Panel1; + } + /** + * @return the main panel of the frame containing the Notes to display in + * the first screen or the screen when there is only screen + */ + public OSMSlideViewerPanel getPanelNotes(){ + return m_PanelNotes; + } + /** + * @return the main panel of the frame containing all the components to display in + * the first screen or the screen when there is only screen + */ + public OSMSlideViewerPanel getPanel(){ + return m_Panel; } + + /** + * window which contains the frame1 when there are two screens + */ + private JWindow m_win1; + + /** + * window which contains the frame when there are two screens + */ + private JWindow m_win; + + /** + * frame which contains the panel for the first screen + */ + private JFrame m_frame; + + /** + * frame which contains the panel for the second screen + */ + private JFrame m_frame1; + /** + * main panel of the frame containing all the components to display in the first screen. + */ + private OSMSlideViewerPanel m_PanelNotes; /** ! * main panel of the frame containing all the components to display in the second screen */ + private OSMSlideViewerPanel m_Panel1; + /** + * main panel of the frame containing all the components to display in the first screen. + */ private OSMSlideViewerPanel m_Panel; + + /** + * height in pixels of the frame two. + */ + private int m_Height2; + + /** + * width in pixels of the frame two. + */ + private int m_Width2; + + /** Index: OSMSlideViewerPanel.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/slideviewer/OSMSlideViewerPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMSlideViewerPanel.java 3 Oct 2007 21:31:16 -0000 1.2 --- OSMSlideViewerPanel.java 17 Feb 2008 22:11:51 -0000 1.3 *************** *** 20,23 **** --- 20,24 ---- import java.awt.*; import java.awt.event.*; + import javax.swing.JPanel; import osmose.application.*; import osmose.application.common.*; *************** *** 30,33 **** --- 31,35 ---- import osmose.application.slidesummary.*; import osmose.application.sound.*; + import osmose.application.user.OSMUser; *************** *** 50,55 **** */ public void goFirst() { - - // If in zoom mode, unzoom component first. if(m_ModeZoom) --- 52,55 ---- *************** *** 58,61 **** --- 58,72 ---- this.goPage(1); } + + /** + * it displays the first slide with Notes of the presentation on the screen. + */ + public void goFirstNotes() { + // If in zoom mode, unzoom component first. + if(m_ModeZoom) + if(m_ZoomedComponent != null) + unZoomComponent(); + this.goPageNotes(1); + } *************** *** 64,69 **** */ public void goLast() { - - // If in zoom mode, unzoom component first. if(m_ModeZoom) --- 75,78 ---- *************** *** 73,76 **** --- 82,95 ---- } + /** + * it displays the last slide with Notes of the presentation on the screen. + */ + public void goLastNotes() { + // If in zoom mode, unzoom component first. + if(m_ModeZoom) + if(m_ZoomedComponent != null) + unZoomComponent(); + this.goPageNotes(this.getNumberOfPages()); + } /** *************** *** 96,99 **** --- 115,137 ---- } + /** + * display the previous slide with Notes on the screen. If the first slide is currently + * displayed this method will stop the viewer (and return in a windowed + * screen mode). + */ + public void goPreviousNotes() { + // If in zoom mode, unzoom component first. + if(m_ModeZoom) + if(m_ZoomedComponent != null) + unZoomComponent(); + + /* verifies if we are at the first slide, if so, stop the viewer else + * display the next slide on the screen. */ + + if(this.getCurrentPage() <= 1) + endOfSlides(); + else + this.goPageNotes(this.getCurrentPage() - 1); + } /** *************** *** 104,114 **** public void goNext() { - // If in zoom mode, unzoom component first. if(m_ModeZoom) if(m_ZoomedComponent != null) unZoomComponent(); - - /** * verifies if we are at the 'Fin du diaporama' page, if so, stop the viewer --- 142,149 ---- *************** *** 121,124 **** --- 156,178 ---- } + /** + * display the next slide with Notes on the screen. If the 'Fin du diaporama' page is + * currently displayed this method will stop the viewer (and return in a + * windowed screen mode). + */ + public void goNextNotes() { + // If in zoom mode, unzoom component first. + if(m_ModeZoom) + if(m_ZoomedComponent != null) + unZoomComponent(); + /** + * verifies if we are at the 'Fin du diaporama' page, if so, stop the viewer + * else display the next slide on the screen. + */ + if(this.getCurrentPage() > this.getNumberOfPages()) + endOfSlides(); + else + this.goPageNotes(this.getCurrentPage() + 1); + } /** *************** *** 132,137 **** */ public Rectangle getBestBounds(Rectangle oldBounds) { - - /** * width and height of the component, x and y position of the left upper --- 186,189 ---- *************** *** 187,195 **** public void goPage(int number, boolean bSound, boolean bVideo) { - // Clear the panel this.removeAll(); - // Stop all playing video for(int d = 0;d < m_VideoPlayer.size();d++) --- 239,245 ---- *************** *** 200,216 **** } - // Stop all playing sounds m_PlayListPlayer.stop(); - // If index ok if((getNumberOfPages() >= number) && (number > 0)) { - // First, the background this.setBackground(Color.WHITE); ! m_CurrentPage = number; ! // Get the page and associated element --- 250,263 ---- } // Stop all playing sounds m_PlayListPlayer.stop(); // If index ok if((getNumberOfPages() >= number) && (number > 0)) { // First, the background this.setBackground(Color.WHITE); ! ! m_CurrentPage = number; // Get the page and associated element *************** *** 219,231 **** OSMElement elt = page.getElement(); - // Construct the title if(elt.getTitleIsIncluded() && model.getTitle().isDisplayed()) { - // Get size and position OSMPageItemProperties properties = page.getTitleProperties(); - // Create a component to display this title OSMSlideTxtComponent component = --- 266,275 ---- *************** *** 243,264 **** component.setUnderlined(page.getModel().getTitle().getFontUnderlined()); - // registers the mouse listeners that will handle the navigation - - // (depending on the mouse click). Enable the possibility for the user - - // to click on this title to go next or previous (and not only in a - // blank area of the screen). component.addMouseListener(m_MouseListener); - // Component is ready, add to the panel this.add(component); - // Set the associated element if(page.getType() == OSMSlide.TITLE) --- 287,300 ---- *************** *** 273,285 **** } - // After title, the body... ! if(model.getBody().isDisplayed()) { ! // Get size and position OSMPageItemProperties propBody = page.getBodyProperties(); - // Create a component to display this body OSMSlideBody compoBody = new OSMSlideBody(this, --- 309,319 ---- } // After title, the body... ! // if the ! if(model.getBody().isDisplayed() & page.getStateBox()==false) { // Get size and position OSMPageItemProperties propBody = page.getBodyProperties(); // Create a component to display this body OSMSlideBody compoBody = new OSMSlideBody(this, *************** *** 288,301 **** Math.round(((float)propBody.getW()) / this.getCoeff()), Math.round(((float)propBody.getH()) / this.getCoeff()), null, true); - - // No cursor compoBody.setNoCursor(); - // set slide type compoBody.setSlideType(page.getType()); - // Set font, size and color Font f = page.getModel().getBody().getFont(); --- 322,331 ---- *************** *** 305,313 **** compoBody.setColor(page.getModel().getBody().getFontColor()); - // Set model for chips compoBody.setModel(page.getModel()); - // Set unselectionnable and unresisable compoBody.setSelectionnable(false); --- 335,341 ---- *************** *** 315,336 **** compoBody.setUnderlined(page.getModel().getBody().getFontUnderlined()); - // Set the associated parent element compoBody.setElement(elt); - // Register mouse listener to move into presentation compoBody.addClickListener(m_MouseListener); - // adds the component to the screen. this.add(compoBody); } - // Number of the page if(page.getModel().getNumber().isDisplayed()) { - // Get size and position OSMPageItemProperties properties = page.getNumberProperties(); --- 343,359 ---- *************** *** 340,348 **** int h = Math.round(((float)properties.getH()) / this.getCoeff()); - // Simple text component OSMTxtComponent compoNumber = new OSMTxtComponent(this, x, y, w, h); - // Set font Font f = page.getModel().getNumber().getFont(); --- 363,369 ---- *************** *** 351,368 **** compoNumber.setFont(nf3); - // Set color compoNumber.setColor(page.getModel().getNumber().getFontColor()); compoNumber.setUnderlined(page.getModel().getNumber().getFontUnderlined()); - // Register mouse listener to move into presentation compoNumber.addMouseListener(m_MouseListener); - // Add component to the panel this.add(compoNumber); - // Set the text of the component Vector vslide = OSMApplication.getPresentation().getPageList(); --- 372,385 ---- *************** *** 370,397 **** } - // At the end, the medias... - // constructs each slide components that will display each media of the - // slide. if(model.getMedias().isDisplayed()) { Vector pagemedias = page.getMediaList(); - // Creates a new slide component for each media. for(java.util.Enumeration e = pagemedias.elements();e.hasMoreElements();) { OSMMedia media = (OSMMedia)e.nextElement(); - // gets the properties of this pagemedia (size, position). OSMPageItemProperties properties = media.getProperties(); - // verifies that the current media has to be included to the - // presentation (user's choice). if(media.isIncluded()) { --- 387,407 ---- *************** *** 478,482 **** creator.finish(); - // Reload image. Image img = Toolkit.getDefaultToolkit().getImage(path + "/" + file); --- 488,491 ---- *************** *** 505,513 **** if(!m_AudioComments) { - // Play the media sound (in fact bSound = true when m_AudioComments = false) m_PlayListPlayer.removeAllFiles(); - // Add sound of first element if(elt.getOSMSndMedia() != null) --- 514,520 ---- *************** *** 515,519 **** m_PlayListPlayer.addFile(elt.getOSMSndMedia().getAbsoluteFileName()); - // Then, add all sounds of sons elements if not a party one. if(!OSMTreeEditorPanel.isAboveTheLine(elt.getComponent())) { --- 522,525 ---- *************** *** 548,552 **** if(m_CurrentPage == (getNumberOfPages() + 1)) - /** * we want to display the page after the 'Fin du diaporama' page, so the --- 554,557 ---- *************** *** 555,560 **** endOfSlides(); else { ! ! /** * we want to display the page directly after the last page of the --- 560,564 ---- endOfSlides(); else { ! /** * we want to display the page directly after the last page of the *************** *** 563,567 **** m_CurrentPage = getNumberOfPages() + 1; - /** * displays 'Fin du diaporama' on the screen. --- 567,570 ---- *************** *** 579,583 **** this.moveToFront(text); - /** * sets the navigation mouse listener that will permits to go back or to --- 582,585 ---- *************** *** 585,601 **** */ text.addMouseListener(m_MouseListener); } } - /** * repaints the content of the page/slide on the screen. */ ! requestFocus(); ! ! // repaint(); } /** --- 587,821 ---- */ text.addMouseListener(m_MouseListener); + } } /** * repaints the content of the page/slide on the screen. */ ! requestFocus(); ! //repaint(); } + /** + * It displays the slide with Notes specified by its number + * @param number the index of the slide + */ + public void goPageNotes(int number) { + // Clear the panel + this.removeAll(); + // If index ok + if((getNumberOfPages() >= number) && (number > 0)) { + + // First, the background + this.setBackground(Color.WHITE); + m_CurrentPage = number; + + // Get the page and associated element + OSMSlide page = (OSMSlide)m_Pages.elementAt(number - 1); + //OSMPageModel model = page.getModel(); + //OSMElement elt = page.getElement(); + + // Get size and position + OSMPageItemProperties propertiesNotes = page.getTextProperties(); + OSMSlideTxtComponent compoNotes = + new OSMSlideTxtComponent(this, + Math.round(((float)propertiesNotes.getX()) / this.getCoeff()), + Math.round(((float)propertiesNotes.getY()) / this.getCoeff()), + Math.round(((float)propertiesNotes.getW()) / this.getCoeff()), + Math.round(((float)propertiesNotes.getH()) / this.getCoeff()), null); + + // Create a component to display the Notes + Font f = page.getModel().getText().getFont(); + Font nf = f.deriveFont((float)f.getSize2D() / this.getCoeff()); + compoNotes.setFont(nf); + compoNotes.setColor(page.getModel().getText().getFontColor()); + compoNotes.setSelectionnable(false); + compoNotes.setResizable(false); + compoNotes.setUnderlined(page.getModel().getText().getFontUnderlined()); + + // registers the mouse listeners that will handle the navigation + // (depending on the mouse click). Enable the possibility for the user + // to click on this title to go next or previous (and not only in a + // blank area of the screen). + + compoNotes.addMouseListener(m_MouseListener); + + //Component is ready, add to the panel + this.add(compoNotes); + boolean aboveTheLine = false; + + // if the checkbox is selected + if(page.getStateBox()==true){ + String notesBody = ""; + OSMElement parent = page.getElement(); + aboveTheLine = OSMTreeEditorPanel.isAboveTheLine(parent.getComponent()); + + if (!aboveTheLine) + { + Vector v = new Vector(); + OSMElement.getSons(parent, v); + int firstLevel = parent.getLevel(); + OSMElement element; + String chip; + for (int k = 0; k < v.size(); k++) + { + element = (OSMElement) v.get(k); + if(element.getTitleIsIncluded()) + { + int level = element.getLevel() - firstLevel; + chip = page.getModel().getChips().getChip(level - 1); + int lTmp = level; + while (lTmp-- > 1) + notesBody+=' '; + notesBody+= chip + ' ' +element.getTitle()+ '\n'; + } + } + } + + if(page.getType() == OSMSlide.SUMMARY){ + Enumeration e=OSMApplication.TreeEditor.getDocument().elements(); + while(e.hasMoreElements()) + { + OSMElement root = (OSMElement)e.nextElement(); + if(root.isInSummary()) + { + int firstLevel = root.getLevel() + 1; + notesBody+=root.getTitle() + '\n'; + Vector v = new Vector(); + OSMElement.getSons(root, v); + for (int idx = 0; idx < v.size(); idx++) + { + OSMElement element = (OSMElement) v.get(idx); + if (element.isInSummary()) + { + int level = element.getLevel() - firstLevel + 1; + while (level-- > 0) + notesBody+=' '; + notesBody+=element.getTitle()+'\n'; + } + } + } + } + } + if(page.getType() == OSMSlide.TITLE) + { + String str = ""; + OSMPresentation presentation = OSMApplication.getPresentation(); + // Add author name + if(presentation.isThereAuthorNameIncluded()) + { + str = (String)OSMUser.USER.getProperty("labels.author",OSMApplication .Localisation.getString("OSM_LabelsAuthor")); + str += " : " + presentation.getAuthorName(); + notesBody+= str + '\n'; + } + // Add author address + if(presentation.isThereAuthorAddressIncluded()) + notesBody += presentation.getAuthorAddress() + '\n'; + // Add author organism + if(presentation.isThereAuthorOrganismIncluded()) + notesBody+= presentation.getAuthorOrganism()+ '\n'; + // Add version number + if(presentation.isThereVersionNumberIncluded()) + { + str = (String)OSMUser.USER.getProperty("labels.version",OSMApplication.Localisation.getString("OSM_LabelsVersion")); + str += " : " + presentation.getVersionNumber(); + notesBody += str + '\n'; + + } + // Add date + if(presentation.isThereVersionDateIncluded()) + notesBody+= presentation.getVersionDate()+'\n'; + // Add keywords + if(presentation.isThereKeywordsIncluded()) + { + str = (String)OSMUser.USER.getProperty("labels.keywords",OSMApplication.Localisation.getString("OSM_LabelsKeywords")); + str += " : " + presentation.getKeywords(); + notesBody += str +'\n'; + + } + // Add summary + if(presentation.isThereResumeIncluded()) + { + str = (String)OSMUser.USER.getProperty("labels.resume",OSMApplication.Localisation.getString("OSM_LabelsResume")); + str += " : " + presentation.getResume(); + notesBody+= str + '\n'; + } + // Add purpose + if(presentation.isTherePurposeIncluded()) + { + str = (String)OSMUser.USER.getProperty("labels.purpose",OSMApplication.Localisation.getString("OSM_LabelsPurpose")); + str += " : " + presentation.getPurpose(); + notesBody += str + '\n'; + } + } + // set the body + compoNotes.setText(notesBody); + } + + // if the checkbox is not selected + else { + + // Set the notes written + compoNotes.setText(page.getWrittenNotes()); + + } + + } + + else { + + + /** + * index of page/slide is not valid (don't exist). Verifies if we have to + * display the page 'Fin du diaporama' (last one) or if we have to close + * the viewer. + */ + if(m_CurrentPage == (getNumberOfPages() + 1)) + + + /** + * we want to display the page after the 'Fin du diaporama' page, so the + * viewer has to be closed. + */ + endOfSlides(); + else { + + + /** + * we want to display the page directly after the last page of the + * presentation. We have to display a slide that says 'Fin du diaporama' + */ + m_CurrentPage = getNumberOfPages() + 1; + + /** + * displays 'Fin du diaporama' on the screen. + */ + OSMTxtComponent text = new OSMTxtComponent(this, m_Width / 2 - 75, 30, 150, 40); + String thestring = ""; + text.setText(thestring); + text.setFont(new Font("Serif", Font.PLAIN, 16)); + text.setColor(Color.WHITE); + OSMBackGroundComponent m_BgCompo = new OSMBackGroundComponent(this, Color.BLACK); + m_BgCompo.addMouseListener(m_MouseListener); + this.add(m_BgCompo); + m_BgCompo.setBounds(0, 0, m_Width, m_Height); + this.add(text); + this.moveToFront(text); + + /** + * sets the navigation mouse listener that will permits to go back or to + * stop the viewer. + */ + text.addMouseListener(m_MouseListener); + } + } + /** + * repaints the content of the page/slide on the screen. + */ + requestFocus(); + } + /** *************** *** 606,609 **** --- 826,832 ---- goPage(number, true, true); } + + + public void keyReleased(KeyEvent e) { *************** *** 634,669 **** * - bottom : go last slide.<br> * @param e the KeyEvent that corresponds to the key pressed */ public void keyPressed(KeyEvent e) { ! switch(e.getKeyCode()) { ! case KeyEvent.VK_BACK_SPACE: ! goPrevious(); ! break; // back space ! case KeyEvent.VK_SPACE: ! goNext(); ! break; // space ! case KeyEvent.VK_LEFT: ! goPrevious(); ! break; // left arrow ! case KeyEvent.VK_RIGHT: ! goNext(); ! break; // right arrow ! case KeyEvent.VK_UP: ! goFirst(); ! break; // up arrow ! case KeyEvent.VK_DOWN: ! goLast(); ! break; // bottom arrow ! case KeyEvent.VK_ESCAPE: ! endOfSlides(); ! break; // escape ! } ! } public void keyTyped(KeyEvent e) { --- 857,924 ---- * - bottom : go last slide.<br> * @param e the KeyEvent that corresponds to the key pressed + * @param num the number of the screens */ public void keyPressed(KeyEvent e) { ! GraphicsDevice[] screenDevices = GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices(); ! switch(e.getKeyCode()) { ! case KeyEvent.VK_BACK_SPACE: ! if(screenDevices.length==1)goPrevious(); ! if(screenDevices.length==2){ ! m_Frame.getPanel().goPrevious(); ! m_Frame.getPanelNotes().goPreviousNotes(); ! m_Frame.getPanel1().goPrevious(); ! } ! break; // back space ! case KeyEvent.VK_SPACE: ! if(screenDevices.length==1)goNext(); ! if(screenDevices.length==2){ ! m_Frame.getPanel().goNext(); ! m_Frame.getPanelNotes().goNextNotes(); ! m_Frame.getPanel1().goNext(); ! } ! break; // space ! case KeyEvent.VK_LEFT: ! if(screenDevices.length==1)goPrevious(); ! if(screenDevices.length==2){ ! m_Frame.getPanel().goPrevious(); ! m_Frame.getPanelNotes().goPreviousNotes(); ! m_Frame.getPanel1().goPrevious(); ! } ! break; // left arrow ! case KeyEvent.VK_RIGHT: ! if(screenDevices.length==1)goNext(); ! if(screenDevices.length==2){ ! m_Frame.getPanel().goNext(); ! m_Frame.getPanelNotes().goNextNotes(); ! m_Frame.getPanel1().goNext(); ! } ! break; // right arrow ! case KeyEvent.VK_UP: ! if(screenDevices.length==1)goFirst(); ! if(screenDevices.length==2){ ! m_Frame.getPanel().goFirst(); ! m_Frame.getPanelNotes().goFirstNotes(); ! m_Frame.getPanel1().goFirst(); ! } ! break; // up arrow ! case KeyEvent.VK_DOWN: ! if(screenDevices.length==1)goLast(); ! if(screenDevices.length==2){ ! m_Frame.getPanel().goLast(); ! m_Frame.getPanelNotes().goLastNotes(); ! m_Frame.getPanel1().goLast(); ! } ! break; // bottom arrow ! case KeyEvent.VK_ESCAPE: ! endOfSlides(); ! break; // escape ! } ! } public void keyTyped(KeyEvent e) { *************** *** 704,709 **** * @param width the width of the frame * @param height the height of the frame */ ! public OSMSlideViewerPanel(OSMSlideViewer frame, OSMDocument doc, int width, int height) { super(null, width, height); m_Frame = frame; --- 959,965 ---- * @param width the width of the frame * @param height the height of the frame + * @param flag if the panel contains the notes or not */ ! public OSMSlideViewerPanel(OSMSlideViewer frame, OSMDocument doc, int width, int height, boolean flag) { super(null, width, height); m_Frame = frame; *************** *** 711,715 **** m_AudioComments = false; - // Get title, summary and sort pages before viewint it OSMPage p = m_Document.getPresentation().getTitlePage(); --- 967,970 ---- *************** *** 725,729 **** m_VideoViewer = null; - // listener listening for 'click to zoom / unzoom' event. m_MouseListenerZoom = new MouseAdapter() { --- 980,983 ---- *************** *** 731,735 **** if(m_ModeZoom) - /** * user has clicked on the screen and we are in the zoom mode, --- 985,988 ---- *************** *** 740,744 **** else - /* * user has clicked on a slide zoomable component and we are in the --- 993,996 ---- *************** *** 753,790 **** // listener listening for 'click on a slide content' to navigate. m_MouseListener = new MouseAdapter() { ! public void mousePressed(MouseEvent e) { ! ! ! /* ! * user has clicked on the content of a slide (not on a zoomable ! * component). We need to operates the corresponding view navigation ! * action. We need to know which mouse button has been pressed to ! * act like this : ! * - left mouse button : go next slide. ! * - right mouse button : go previous slide. ! * - center mouse button : go first slide. (not supported on Win32) ! */ ! switch(e.getButton()) { ! case MouseEvent.BUTTON1: ! goNext(); ! break; // left mouse button ! case MouseEvent.BUTTON3: ! goPrevious(); ! break; // right mouse button ! case MouseEvent.BUTTON2: ! goFirst(); ! break; // center mouse button ! } ! } ! }; this.addMouseListener(m_MouseListener); // If summary never has been created, generate it OSMSummaryCreator creator = new OSMSummaryCreator(m_Document); creator.generateSummary(m_Document.getPresentation().getSummaryDepth()); ! // listener listening for 'key pressed' to navigate. --- 1005,1057 ---- // listener listening for 'click on a slide content' to navigate. m_MouseListener = new MouseAdapter() { ! public void mousePressed(MouseEvent e) { ! /* ! * user has clicked on the content of a slide (not on a zoomable ! * component). We need to operates the corresponding view navigation ! * action. We need to know which mouse button has been pressed to ! * act like this : ! * - left mouse button : go next slide. ! * - right mouse button : go previous slide. ! * - center mouse button : go first slide. (not supported on Win32) ! */ ! GraphicsDevice[] screenDevices = GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices(); ! switch(e.getButton()) { ! case MouseEvent.BUTTON1: ! if(screenDevices.length==1)goNext(); ! if(screenDevices.length==2){ ! m_Frame.getPanel().goNext(); ! m_Frame.getPanelNotes().goNextNotes(); ! m_Frame.getPanel1().goNext(); ! } ! break; // left mouse button ! case MouseEvent.BUTTON3: ! if(screenDevices.length==1)goPrevious(); ! if(screenDevices.length==2){ ! m_Frame.getPanel().goPrevious(); ! m_Frame.getPanelNotes().goPreviousNotes(); ! m_Frame.getPanel1().goPrevious(); ! } ! break; // right mouse button ! case MouseEvent.BUTTON2: ! if(screenDevices.length==1)goFirst(); ! if(screenDevices.length==2){ ! m_Frame.getPanel().goFirst(); ! m_Frame.getPanelNotes().goFirstNotes(); ! m_Frame.getPanel1().goFirst(); ! } ! break; // center mouse button ! } ! } ! }; this.addMouseListener(m_MouseListener); // If summary never has been created, generate it + if(flag==false){ OSMSummaryCreator creator = new OSMSummaryCreator(m_Document); creator.generateSummary(m_Document.getPresentation().getSummaryDepth()); ! } // listener listening for 'key pressed' to navigate. *************** *** 810,814 **** protected void zoomComponent(OSMSlideComponent component) { - /** * verifies that we aren't in the zoom mode and that the specified component --- 1077,1080 ---- *************** *** 817,821 **** if((!m_ModeZoom) && (component != null)) { - /** * removes the current slide content, and add only the specified component --- 1083,1086 ---- *************** *** 880,885 **** m_ZoomedComponent = null; m_ZoomedComponentBounds = null; - - // repaint(); } --- 1145,1148 ---- |
|
From: Olivier G. <og...@us...> - 2008-02-17 22:11:48
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/slideprinter In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6501/src/osmose/application/slideprinter Modified Files: OSMSlidePrinter.java Log Message: Added choice for putting bullet lists in notes (by Fatimatou) Index: OSMSlidePrinter.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/slideprinter/OSMSlidePrinter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMSlidePrinter.java 3 Oct 2007 21:31:15 -0000 1.2 --- OSMSlidePrinter.java 17 Feb 2008 22:11:51 -0000 1.3 *************** *** 38,228 **** ! /** ! * To get the Printable instance responsible for rendering the page specified ! * by pageIndex. ! * @param pageIndex Index of page. ! * @return Printable instance associated to the page. ! */ ! public Printable getPrintable(int pageIndex) { ! return this; ! } ! ! ! /** ! * Constructs a slide printer that implement the Printable interface and ! * that will print each page of the presentation in a graphics thanks to the ! * print() method. ! * @param doc The document to print. ! */ ! public OSMSlidePrinter(OSMDocument doc) { ! super(null, doc, 711, 533); ! ! ! // Set this panel as for printing. ! setForPrinting(); ! ! ! // Sort pages before printing ! m_Document.getPresentation().sortPages(); ! ! ! // Get pages list ! m_PagesNumber = m_Document.getPresentation().getNumberOfPages(); ! ! ! // Create a new printer job ! m_PrinterJob = PrinterJob.getPrinterJob(); ! m_PrinterJob.setPageable(this); ! } ! ! ! /** ! * To draw a page in a given graphic context. ! * @param g The graphic context. ! * @param pf The page format. ! * @param pageIndex The index of page to print. ! * @return PAGE_EXISTS if Ok, NO_SUCH_PAGE if page not exist. ! */ ! public int print(Graphics g, PageFormat pf, int pageIndex) { ! ! ! // Checks if the specified index of page is a valid index. ! if((pageIndex >= m_PagesNumber) || (pageIndex < 0)) ! return Printable.NO_SUCH_PAGE; // Index out of range... ! else { ! ! ! // Convert Graphics to Graphics2D ! Graphics2D g2d = (Graphics2D)g; ! ! ! // Keep old transform ! AffineTransform oldAt = g2d.getTransform(); ! ! ! /** ! * size properties of the page : ! * - iW = integer corresponding to available width of the content ! * - iH = integer corresponding to available height of the content ! * - iX = integer corresponding to left and right insets ! * - iY = integer corresponding to top and bottom insets ! */ ! int iW = (int)pf.getImageableWidth(); ! int iH = (int)pf.getImageableHeight(); ! int iX = (int)pf.getImageableX(); ! int iY = (int)pf.getImageableY(); ! ! ! // constructs the content of the specified page in the panel. ! goPage(pageIndex + 1, false, false); ! repaint(); ! ! ! // Translate graphics to printable area ! g2d.translate(iX, iY); ! // Paint the current page in the printable graphics. ! JFrame invisibleContainer = new JFrame(); ! invisibleContainer.getContentPane().add(this); ! invisibleContainer.pack(); ! invisibleContainer.setVisible(false); ! paint(g); - // Restores the graphics transformation for further draw. - g2d.setTransform(oldAt); - // Draws a rectangles to show the page limits (size). - g2d.setColor(Color.BLACK); - g2d.drawRect(iX, iY, iW - 1, iH - 1); - // Indicates to java that the specified page has been drawn - return Printable.PAGE_EXISTS; - } - } ! /** ! * To get the number of pages in the presentation. ! * @return Total number of pages. ! */ ! public int getNumberOfPages() { ! return m_PagesNumber; ! } ! /** ! * To get the PageFormat of the page specified by pageIndex. ! * @param pageIndex Index of page. ! * @return Page format of associated page. ! */ ! public PageFormat getPageFormat(int pageIndex) { ! // picks the default page format. ! PageFormat p = this.m_PrinterJob.defaultPage(); ! /** ! * creates a new paper format, that sets : ! * - A4 size (21 * 29.7 cm = 594 * 842 px) ! * - printable area of 534 * 712 px ! * - left and right inset of 842-712 / 2 ! * - up and down inset of 595-534 / 2 ! */ ! Paper paper = new Paper(); ! paper.setSize(594, 842); // A4 format ! int lrinset = 65; ! int udinset = 30; ! paper.setImageableArea(udinset, lrinset, (int)paper.getWidth() - 2 * udinset, (int)paper.getHeight() - 2 * lrinset); ! p.setPaper(paper); ! /** ! * sets the orientation of the page to Landscape. ! * NB: in the next version of the application, we'll have to checks if the ! * user wants a printed slide with graphics or not, if yes, the page will be ! * printed in Normal mode. ! */ ! p.setOrientation(PageFormat.LANDSCAPE); ! return p; ! } ! /** ! * To print the presentation. ! * @return True if ok, false if not. ! */ ! public boolean printPresentation() { ! try { ! // displays of dialog that permits to the user to sets print format. ! if(m_PrinterJob.printDialog()) { ! // prints the presentation with the user choosen print format ! m_PrinterJob.print(); ! return true; ! } ! } ! catch(Throwable e) { ! } ! return false; ! } ! /** ! * Printer Job. ! */ ! private PrinterJob m_PrinterJob; ! /** ! * pages/slides containing the content of all the slides. ! */ ! private int m_PagesNumber; ! } --- 38,229 ---- ! /** ! * To get the Printable instance responsible for rendering the page specified ! * by pageIndex. ! * @param pageIndex Index of page. ! * @return Printable instance associated to the page. ! */ ! public Printable getPrintable(int pageIndex) { ! return this; ! } ! /** ! * Constructs a slide printer that implement the Printable interface and ! * that will print each page of the presentation in a graphics thanks to the ! * print() method. ! * @param doc The document to print. ! */ ! public OSMSlidePrinter(OSMDocument doc) { ! super(null, doc, 533, 400, false); ! ! // Set this panel as for printing. ! setForPrinting(); + // Sort pages before printing + m_Document.getPresentation().sortPages(); + // Get pages list + m_PagesNumber = m_Document.getPresentation().getNumberOfPages(); + // Create a new printer job + m_PrinterJob = PrinterJob.getPrinterJob(); + m_PrinterJob.setPageable(this); + } + /** + * To draw a page in a given graphic context. + * @param g The graphic context. + * @param pf The page format. + * @param pageIndex The index of page to print. + * @return PAGE_EXISTS if Ok, NO_SUCH_PAGE if page not exist. + */ + public int print(Graphics g, PageFormat pf, int pageIndex) { ! // Checks if the specified index of page is a valid index. ! if((pageIndex >= m_PagesNumber) || (pageIndex < 0)) ! return Printable.NO_SUCH_PAGE; // Index out of range... ! else { + // Convert Graphics to Graphics2D + Graphics2D g2d = (Graphics2D)g; ! // Keep old transform ! AffineTransform oldAt = g2d.getTransform(); ! /** ! * size properties of the page : ! * - iW = integer corresponding to available width of the content ! * - iH = integer corresponding to available height of the content ! * - iX = integer corresponding to left and right insets ! * - iY = integer corresponding to top and bottom insets ! */ ! ! int iW = (int)pf.getImageableWidth()*3/4; ! int iH = (int)pf.getImageableHeight()*3/4; ! int iX = (int)pf.getImageableX(); ! int iY = (int)pf.getImageableY(); ! int iY2 = (int)pf.getImageableHeight()*3/4; ! int iX2 = (int)pf.getImageableX()/6; ! ! // constructs the content of the specified page in the panel. ! goPage(pageIndex + 1, false, false); ! repaint(); ! ! // Translate graphics to printable area ! g2d.translate(iX, iY); + // Paint the current page in the printable graphics. + JFrame invisibleContainer = new JFrame(); + invisibleContainer.getContentPane().add(this); + invisibleContainer.pack(); + invisibleContainer.setVisible(false); + paint(g); + + g2d.setColor(Color.BLACK); + + + //Translate graphics to printable area for notes + g2d.translate(iX2, iY2); + + goPageNotes(pageIndex+1); + invisibleContainer.getContentPane().add(this); + invisibleContainer.setVisible(false); + paint(g); + + //Restores the graphics transformation for further draw. + g2d.setTransform(oldAt); + + // Draws a rectangles to show the frame limits (size) for the slide. + g2d.setColor(Color.BLACK); + g2d.drawRect(iX, iY, iW - 1, iH); + + // Indicates to java that the specified page has been drawn + return Printable.PAGE_EXISTS; + } + } + + + /** + * To get the number of pages in the presentation. + * @return Total number of pages. + */ + public int getNumberOfPages() { + return m_PagesNumber; + } ! /** ! * To get the PageFormat of the page specified by pageIndex. ! * @param pageIndex Index of page. ! * @return Page format of associated page. ! */ ! public PageFormat getPageFormat(int pageIndex) { ! // picks the default page format. ! PageFormat p = this.m_PrinterJob.defaultPage(); ! /** ! * creates a new paper format, that sets : ! * - A4 size (21 * 29.7 cm = 594 * 842 px) ! * - printable area of 534 * 712 px ! * - left and right inset of 842-712 / 2 ! * - up and down inset of 595-534 / 2 ! */ ! Paper paper = new Paper(); ! paper.setSize(594, 842); // A4 format ! int lrinset = 65; ! int udinset = 30; ! paper.setImageableArea(udinset, lrinset, (int)paper.getWidth() - 2 * udinset, (int)paper.getHeight() - 2 * lrinset); ! p.setPaper(paper); ! /** ! * sets the orientation of the page to Landscape. ! * NB: in the next version of the application, we'll have to checks if the ! * user wants a printed slide with graphics or not, if yes, the page will be ! * printed in Normal mode. ! */ ! p.setOrientation(PageFormat.LANDSCAPE); ! ! return p; ! } ! /** ! * To print the presentation. ! * @return True if ok, false if not. ! */ ! public boolean printPresentation() { ! ! try { ! ! // displays of dialog that permits to the user to sets print format. ! if(m_PrinterJob.printDialog()) { ! // prints the presentation with the user choosen print format ! m_PrinterJob.print(); ! return true; ! } ! } ! catch(Throwable e) { ! } ! return false; ! } ! /** ! * Printer Job. ! */ ! private PrinterJob m_PrinterJob; ! /** ! * pages/slides containing the content of all the slides. ! */ ! private int m_PagesNumber; ! } |
|
From: Olivier G. <og...@us...> - 2008-02-17 22:11:48
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/menucommand In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6501/src/osmose/application/menucommand Modified Files: OSMMenuFilePrint.java Log Message: Added choice for putting bullet lists in notes (by Fatimatou) Index: OSMMenuFilePrint.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/menucommand/OSMMenuFilePrint.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMMenuFilePrint.java 3 Oct 2007 21:31:15 -0000 1.2 --- OSMMenuFilePrint.java 17 Feb 2008 22:11:51 -0000 1.3 *************** *** 16,19 **** --- 16,21 ---- package osmose.application.menucommand; + import java.awt.BorderLayout; + import osmose.application.common.*; import osmose.application.data.*; *************** *** 40,43 **** --- 42,46 ---- m_Frame = frame; m_PrintPreparator = new OSMSlidePrinter(doc); + } *************** *** 66,69 **** * The slide print preparator frame. ****************************************************************************/ ! OSMSlidePrinter m_PrintPreparator; } --- 69,77 ---- * The slide print preparator frame. ****************************************************************************/ ! public OSMSlidePrinter m_PrintPreparator; ! ! /***************************************************************************** ! * The slide print preparator frame for the notes. ! ****************************************************************************/ ! } |
|
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. |
|
From: Olivier G. <og...@us...> - 2008-02-17 22:11:47
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/file In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6501/src/osmose/application/file Modified Files: OSMFile.java OSMFileLoad.java OSMFileSaveAs.java Log Message: Added choice for putting bullet lists in notes (by Fatimatou) Index: OSMFile.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/file/OSMFile.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** OSMFile.java 3 Oct 2007 21:31:14 -0000 1.4 --- OSMFile.java 17 Feb 2008 22:11:51 -0000 1.5 *************** *** 92,95 **** --- 92,96 ---- public static final String OSM_SLIDE_MODEL="model"; public static final String OSM_SLIDE_TYPE="type"; + public static final String OSM_SLIDE_STATE_BOX ="statebox"; public static final String OSM_SLIDE_TITLE="title"; public static final String OSM_SLIDE_NUMBER="number"; Index: OSMFileLoad.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/file/OSMFileLoad.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OSMFileLoad.java 3 Oct 2007 21:31:15 -0000 1.3 --- OSMFileLoad.java 17 Feb 2008 22:11:51 -0000 1.4 *************** *** 768,772 **** } ! /** * It returns an integer that indicates the type of the slide --- 768,787 ---- } ! /** ! * It returns a boolean that indicates the state of the checkbox of the slide ! * @param node the part of the file to be analyzed ! * @return a boolean representing the stateof the checkbox of the slide ! */ ! private boolean getSlideStateBox(Node node) { ! boolean state = false; ! NamedNodeMap map = node.getAttributes(); ! if(map.getLength() > 0) { ! Node n = map.getNamedItem(OSMFile.OSM_SLIDE_STATE_BOX); ! if(n != null) ! state= Boolean.valueOf(getStringCleaned(n.getNodeValue())).booleanValue(); ! } ! return state; ! } ! /** * It returns an integer that indicates the type of the slide *************** *** 793,798 **** OSMElement elt = this.m_OSMDocument.getElementById(getSlideParent(n)); int slideType = getSlideType(n); ! if ( (elt != null) || (slideType == OSMSlide.TITLE) || ! (slideType == OSMSlide.SUMMARY)) { OSMSlide slide = null; if (slideType == OSMSlide.TITLE) --- 808,813 ---- OSMElement elt = this.m_OSMDocument.getElementById(getSlideParent(n)); int slideType = getSlideType(n); ! boolean statebox = getSlideStateBox(n); ! if ( (elt != null) || (slideType == OSMSlide.TITLE) || (slideType == OSMSlide.SUMMARY)) { OSMSlide slide = null; if (slideType == OSMSlide.TITLE) *************** *** 805,808 **** --- 820,824 ---- elt.setPage(slide); } + slide.setStateBox(statebox); NodeList children = n.getChildNodes(); for (int k = 0; k < children.getLength(); k++) { *************** *** 842,846 **** } if (slideType == OSMSlide.NORMAL) { - //Adds the slide that parent is on the line to the presentation. if (elt.isOnTheLine()) --- 858,861 ---- Index: OSMFileSaveAs.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/file/OSMFileSaveAs.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMFileSaveAs.java 3 Oct 2007 21:31:15 -0000 1.2 --- OSMFileSaveAs.java 17 Feb 2008 22:11:51 -0000 1.3 *************** *** 110,115 **** return str; } ! ! /** * it saves the properties (of a slide, a title, a media .....) --- 110,114 ---- return str; } ! /** * it saves the properties (of a slide, a title, a media .....) *************** *** 416,423 **** // Open slide tag String att = OSMFile.OSM_SLIDE_ATT_PARENT + "=\"" + slide.getElement().getID() + "\" "; ! att += OSMFile.OSM_SLIDE_TYPE + "=\"" + slide.getType() + "\""; String str = OSMFile.getTag1(OSMFile.OSM_SLIDE_TAG, att) + "\n"; - // Save model str += OSMFile.getTag1(OSMFile.OSM_SLIDE_MODEL) + slide.getModel().getName() + OSMFile.getTag2(OSMFile.OSM_SLIDE_MODEL) + "\n"; --- 415,422 ---- // Open slide tag String att = OSMFile.OSM_SLIDE_ATT_PARENT + "=\"" + slide.getElement().getID() + "\" "; ! att += OSMFile.OSM_SLIDE_TYPE + "=\"" + slide.getType() + "\" "; ! att += OSMFile.OSM_SLIDE_STATE_BOX + "=\"" + slide.getStateBox() + "\""; String str = OSMFile.getTag1(OSMFile.OSM_SLIDE_TAG, att) + "\n"; // Save model str += OSMFile.getTag1(OSMFile.OSM_SLIDE_MODEL) + slide.getModel().getName() + OSMFile.getTag2(OSMFile.OSM_SLIDE_MODEL) + "\n"; *************** *** 443,447 **** str += saveSlideOralNotes(slide) + "\n"; - // Close slide tag str += OSMFile.getTag2(OSMFile.OSM_SLIDE_TAG) + "\n"; --- 442,445 ---- *************** *** 482,486 **** return sRet; } ! /** * it saves the body of the slide in XML format --- 480,484 ---- return sRet; } ! /** * it saves the body of the slide in XML format |
|
From: Olivier G. <og...@us...> - 2008-02-17 22:11:47
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/export In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6501/src/osmose/application/export Modified Files: OSMExportHTML.java Log Message: Added choice for putting bullet lists in notes (by Fatimatou) Index: OSMExportHTML.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/export/OSMExportHTML.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** OSMExportHTML.java 3 Oct 2007 21:31:14 -0000 1.6 --- OSMExportHTML.java 17 Feb 2008 22:11:51 -0000 1.7 *************** *** 20,23 **** --- 20,24 ---- import java.util.*; import java.awt.*; + import javax.swing.*; import osmose.application.*; *************** *** 200,204 **** boolean aboveTheLine = false; JFrame frame = new JFrame(); ! OSMSlideViewerPanel panel = new OSMSlideViewerPanel(null, m_Document, 800, 600); frame.getContentPane().add(panel); frame.setVisible(true); --- 201,206 ---- boolean aboveTheLine = false; JFrame frame = new JFrame(); ! //OSMSlideViewerPanel panel = new OSMSlideViewerPanel(null, m_Document, 800, 600,false); ! OSMSlideViewerPanel panel = new OSMSlideViewerPanel(null, m_Document, 600, 450,false); frame.getContentPane().add(panel); frame.setVisible(true); *************** *** 310,317 **** String notesStr = ""; if (m_DialogExport.isHTMLNotIncluded()) { - if (!slide.getWrittenNotes().equals("")) { notesStr += "Notes : <br>"; ! notesStr += convert2HTML(slide.getWrittenNotes()); ! } } slideStr=replaceTag(slideStr,"{NOTES.TEXT}", notesStr); --- 312,450 ---- String notesStr = ""; if (m_DialogExport.isHTMLNotIncluded()) { notesStr += "Notes : <br>"; ! if(slide.getStateBox()==false){ ! notesStr += convert2HTML(slide.getWrittenNotes()); ! } ! else { ! if(model.getBody().isDisplayed() & slide.getStateBox()== true){ ! int thickness = 8; ! styleStr = ""; ! OSMPageItemProperties properties = slide.getBodyProperties(); ! Font f = slide.getModel().getBody().getFont(); ! Font nf = f.deriveFont((f.getSize()) / m_FontCoeff); ! Color c = slide.getModel().getBody().getFontColor(); ! int x = properties.getX()/m_coeff + thickness; ! int y = (properties.getY()/m_coeff); ! int w = properties.getW()/m_coeff - thickness; ! int h = properties.getH()/m_coeff - nf.getSize() - thickness; ! styleStr += " #body_"+parent.hashCode(); ! styleStr += " {position:absolute;left:"+(x)+"px;top:"+(y)+"px;"; ! styleStr += "width:"+(w)+"px;height:"+(h)+"px;"; ! styleStr += "font-family:"+convertJavaFontToCSSFont(f)+",sans-serif;"; ! styleStr += "font-size:"+nf.getSize()+"pt;"; ! styleStr += "color : #" + getHexaColor(c) + ";"; ! if(nf.isBold()) ! styleStr += "font-weight : bold;"; ! if(nf.isItalic()) ! styleStr += "font-style : italic;"; ! if (slide.getModel().getBody().getFontUnderlined()) ! styleStr += "text-decoration:underline;"; ! styleStr += "}\n"; ! notesStr +=" <div id=\"body_"+parent.hashCode()+"\">"; ! if (!aboveTheLine) ! { ! Vector v = new Vector(); ! OSMElement.getSons(parent, v); ! int firstLevel = parent.getLevel(); ! OSMElement elt; ! String chip; ! for (int k = 0; k < v.size(); k++) ! { ! elt = (OSMElement) v.get(k); ! if(elt.getTitleIsIncluded()) ! { ! int level = elt.getLevel() - firstLevel; ! chip = slide.getModel().getChips().getChip(level - 1); ! int lTmp = level; ! while (lTmp-- > 1) ! notesStr += " "; ! notesStr += convert2HTML(chip + " " + elt.getTitle()) +"<br>"; ! } ! } ! } ! if(slide.getType() == OSMSlide.SUMMARY) ! { ! // If summary never has been created, generate it ! OSMSummaryCreator creator = new OSMSummaryCreator(OSMApplication.getDocument()); ! creator.generateSummary(OSMApplication.getPresentation().getSummaryDepth()); ! // Then add lines... ! Enumeration e=OSMApplication.TreeEditor.getDocument().elements(); ! while(e.hasMoreElements()) ! { ! OSMElement root = (OSMElement)e.nextElement(); ! if(root.isInSummary()) ! { ! int firstLevel = root.getLevel() + 1; ! notesStr += convert2HTML(root.getTitle()) + "<br>"; ! Vector v = new Vector(); ! OSMElement.getSons(root, v); ! for (int idx = 0; idx < v.size(); idx++) ! { ! OSMElement elt = (OSMElement) v.get(idx); ! if (elt.isInSummary()) ! { ! int level = elt.getLevel() - firstLevel + 1; ! while (level-- > 0) ! notesStr += " "; ! notesStr += convert2HTML(elt.getTitle()) + "<br>"; ! } ! } ! } ! } ! } ! if(slide.getType() == OSMSlide.TITLE) ! { ! String str = ""; ! OSMPresentation presentation = m_Document.getPresentation(); ! // Add author name ! if(presentation.isThereAuthorNameIncluded()) ! { ! str = (String)OSMUser.USER.getProperty("labels.author",OSMApplication .Localisation.getString("OSM_LabelsAuthor")); ! str += " : " + presentation.getAuthorName(); ! notesStr+=convert2HTML(str) + "<br>"; ! } ! // Add author address ! if(presentation.isThereAuthorAddressIncluded()) ! notesStr += convert2HTML(presentation.getAuthorAddress()) + "<br>"; ! // Add author organism ! if(presentation.isThereAuthorOrganismIncluded()) ! notesStr += convert2HTML(presentation.getAuthorOrganism())+"<br>"; ! // Add version number ! if(presentation.isThereVersionNumberIncluded()) ! { ! str = (String)OSMUser.USER.getProperty("labels.version",OSMApplication.Localisation.getString("OSM_LabelsVersion")); ! str += " : " + presentation.getVersionNumber(); ! notesStr += convert2HTML(str) + "<br>"; ! ! } ! // Add date ! if(presentation.isThereVersionDateIncluded()) ! notesStr+= convert2HTML(presentation.getVersionDate())+"<br>"; ! // Add keywords ! if(presentation.isThereKeywordsIncluded()) ! { ! str = (String)OSMUser.USER.getProperty("labels.keywords",OSMApplication.Localisation.getString("OSM_LabelsKeywords")); ! str += " : " + presentation.getKeywords(); ! notesStr += convert2HTML(str) + "<br>"; ! } ! // Add summary ! if(presentation.isThereResumeIncluded()) ! { ! str = (String)OSMUser.USER.getProperty("labels.resume",OSMApplication.Localisation.getString("OSM_LabelsResume")); ! str += " : " + presentation.getResume(); ! notesStr += convert2HTML(str) + "<br>"; ! } ! // Add purpose ! if(presentation.isTherePurposeIncluded()) ! { ! str = (String)OSMUser.USER.getProperty("labels.purpose",OSMApplication.Localisation.getString("OSM_LabelsPurpose")); ! str += " : " + presentation.getPurpose(); ! notesStr += convert2HTML(str) + "<br>"; ! } ! } ! notesStr += "</div>\n"; ! } ! ! } } slideStr=replaceTag(slideStr,"{NOTES.TEXT}", notesStr); *************** *** 357,361 **** styleStr += "width:"+(w)+"px;height:"+(h)+"px;"; styleStr += "font-family:"+convertJavaFontToCSSFont(f)+",sans-serif;"; ! styleStr += "font-size:"+nf.getSize()+"pt;"; styleStr += "color : #" + getHexaColor(c) + ";"; if(nf.isBold()) --- 490,494 ---- styleStr += "width:"+(w)+"px;height:"+(h)+"px;"; styleStr += "font-family:"+convertJavaFontToCSSFont(f)+",sans-serif;"; ! styleStr += "font-size:"+nf.getSize()+"pt;"; styleStr += "color : #" + getHexaColor(c) + ";"; if(nf.isBold()) *************** *** 444,448 **** // Body ! if(model.getBody().isDisplayed()) { OSMPageItemProperties properties = slide.getBodyProperties(); --- 577,581 ---- // Body ! if(model.getBody().isDisplayed() & slide.getStateBox()==false) { OSMPageItemProperties properties = slide.getBodyProperties(); *************** *** 458,462 **** styleStr += "width:"+(w)+"px;height:"+(h)+"px;"; styleStr += "font-family:"+convertJavaFontToCSSFont(f)+",sans-serif;"; ! styleStr += "font-size:"+nf.getSize()+"pt;"; styleStr += "color : #" + getHexaColor(c) + ";"; if(nf.isBold()) --- 591,595 ---- styleStr += "width:"+(w)+"px;height:"+(h)+"px;"; styleStr += "font-family:"+convertJavaFontToCSSFont(f)+",sans-serif;"; ! styleStr += "font-size:"+nf.getSize()+"pt;"; styleStr += "color : #" + getHexaColor(c) + ";"; if(nf.isBold()) |
|
From: Olivier G. <og...@us...> - 2008-02-17 22:11:47
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6501/src/osmose/application/common/slidecomponent Modified Files: OSMSlideBody.java OSMSlideTxtComponent.java Log Message: Added choice for putting bullet lists in notes (by Fatimatou) Index: OSMSlideBody.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent/OSMSlideBody.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMSlideBody.java 30 Aug 2005 17:44:01 -0000 1.1.1.1 --- OSMSlideBody.java 17 Feb 2008 22:11:50 -0000 1.2 *************** *** 39,42 **** --- 39,187 ---- public class OSMSlideBody extends OSMSlideComponent { + + + /** + * Put in a string the text displayed in the body + */ + public void setTextBody (){ + boolean aboveTheLine = false; + m_TextBody = ""; + aboveTheLine = OSMTreeEditorPanel.isAboveTheLine(m_Element.getComponent()); + + if (!aboveTheLine) + { + Vector v = new Vector(); + OSMElement.getSons(m_Element, v); + int firstLevel = m_Element.getLevel(); + OSMElement element; + String chip; + for (int k = 0; k < v.size(); k++) + { + element = (OSMElement) v.get(k); + if(element.getTitleIsIncluded()) + { + int level = element.getLevel() - firstLevel; + chip = m_Model.getChips().getChip(level - 1); + int lTmp = level; + while (lTmp-- > 1){ + m_TextBody+=' '; + m_TextBody+=' '; + } + m_TextBody+= chip + ' ' +element.getTitle()+ '\n'; + } + } + } + + if(this.m_SlideType == OSMSlide.SUMMARY){ + Enumeration e=OSMApplication.TreeEditor.getDocument().elements(); + while(e.hasMoreElements()) + { + OSMElement root = (OSMElement)e.nextElement(); + if(root.isInSummary()) + { + int firstLevel = root.getLevel() + 1; + m_TextBody+=root.getTitle() + '\n'; + Vector v = new Vector(); + OSMElement.getSons(root, v); + for (int idx = 0; idx < v.size(); idx++) + { + OSMElement element = (OSMElement) v.get(idx); + if (element.isInSummary()) + { + int level = element.getLevel() - firstLevel + 1; + while (level-- > 0){ + m_TextBody+=' '; + m_TextBody+=' '; + } + m_TextBody+=element.getTitle()+'\n'; + } + } + } + } + } + if(m_SlideType == OSMSlide.TITLE) + { + String str = ""; + OSMPresentation presentation = OSMApplication.getPresentation(); + // Add author name + if(presentation.isThereAuthorNameIncluded()) + { + str = (String)OSMUser.USER.getProperty("labels.author",OSMApplication .Localisation.getString("OSM_LabelsAuthor")); + str += " : " + presentation.getAuthorName(); + m_TextBody+= str + '\n'; + } + // Add author address + if(presentation.isThereAuthorAddressIncluded()) + m_TextBody += presentation.getAuthorAddress() + '\n'; + // Add author organism + if(presentation.isThereAuthorOrganismIncluded()) + m_TextBody+= presentation.getAuthorOrganism()+ '\n'; + // Add version number + if(presentation.isThereVersionNumberIncluded()) + { + str = (String)OSMUser.USER.getProperty("labels.version",OSMApplication.Localisation.getString("OSM_LabelsVersion")); + str += " : " + presentation.getVersionNumber(); + m_TextBody += str + '\n'; + + } + // Add date + if(presentation.isThereVersionDateIncluded()) + m_TextBody+= presentation.getVersionDate()+'\n'; + // Add keywords + if(presentation.isThereKeywordsIncluded()) + { + str = (String)OSMUser.USER.getProperty("labels.keywords",OSMApplication.Localisation.getString("OSM_LabelsKeywords")); + str += " : " + presentation.getKeywords(); + m_TextBody += str +'\n'; + + } + // Add summary + if(presentation.isThereResumeIncluded()) + { + str = (String)OSMUser.USER.getProperty("labels.resume",OSMApplication.Localisation.getString("OSM_LabelsResume")); + str += " : " + presentation.getResume(); + m_TextBody+= str + '\n'; + } + // Add purpose + if(presentation.isTherePurposeIncluded()) + { + str = (String)OSMUser.USER.getProperty("labels.purpose",OSMApplication.Localisation.getString("OSM_LabelsPurpose")); + str += " : " + presentation.getPurpose(); + m_TextBody += str + '\n'; + } + } + } + + /** + * Put a vector of string in the body + * @param a vector of string + */ + + public void addTextChipsList(Vector chipsList){ + for(int i = 0;i < chipsList.size();i++) { + String text ; + int level; + OSMSlideBodyLine line = (OSMSlideBodyLine)chipsList.elementAt(i); + text = line.getText(); + level = line.getLevel(); + addStaticLine(text, level); + } + } + + /** + * Return the OSMSlideBodyLine list + * @return the OSMSlideBodyLine list + */ + public Vector getSlideBodyLineList(){ + return m_LineList; + } + + /** + * Return the text displayed in the body + * @return the text of the body + */ + public String getTextBody(){ + return m_TextBody; + } /** *************** *** 455,459 **** * @param level The level in hierarchy. */ ! private void addStaticLine(String txt, int level) { OSMSlideBodyLine line = new OSMSlideBodyLine(m_SlidePanel, this, m_Element, txt, level); line.setSelectionnable(false); --- 600,604 ---- * @param level The level in hierarchy. */ ! public void addStaticLine(String txt, int level) { OSMSlideBodyLine line = new OSMSlideBodyLine(m_SlidePanel, this, m_Element, txt, level); line.setSelectionnable(false); *************** *** 560,564 **** * To remove all lines of the body. */ ! private void removeAllLines() { Iterator it = m_LineList.iterator(); while(it.hasNext()) { --- 705,709 ---- * To remove all lines of the body. */ ! public void removeAllLines() { Iterator it = m_LineList.iterator(); while(it.hasNext()) { *************** *** 587,591 **** add(line); } ! /** --- 732,740 ---- add(line); } ! ! /** ! * The Text displayed in the body ! */ ! public String m_TextBody; /** *************** *** 611,614 **** --- 760,764 ---- */ private boolean m_OnlyDisplay = false; + Index: OSMSlideTxtComponent.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/slidecomponent/OSMSlideTxtComponent.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMSlideTxtComponent.java 3 Oct 2007 21:31:13 -0000 1.2 --- OSMSlideTxtComponent.java 17 Feb 2008 22:11:50 -0000 1.3 *************** *** 126,129 **** --- 126,139 ---- repaint(); } + + + /** + * Return the text displayed + * @return the text of a line of a body + */ + + public String getText(){ + return m_Text; + } |
|
From: Olivier G. <og...@us...> - 2008-02-17 22:11:47
|
Update of /cvsroot/osmose-dev/osmose/resources/localization In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6501/resources/localization Modified Files: osmose_local_en_US.properties osmose_local_fr_FR.properties Log Message: Added choice for putting bullet lists in notes (by Fatimatou) Index: osmose_local_en_US.properties =================================================================== RCS file: /cvsroot/osmose-dev/osmose/resources/localization/osmose_local_en_US.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** osmose_local_en_US.properties 6 Jul 2006 17:12:36 -0000 1.4 --- osmose_local_en_US.properties 17 Feb 2008 22:11:49 -0000 1.5 *************** *** 83,86 **** --- 83,87 ---- SED_SlideDefault=Default design SED_NotesAreaTitle=Notes + SED_NotesCheckboxTitle=Bullet lists in notes SED_ModelChoose=Select a model SED_BaseModelLabel=Base model Index: osmose_local_fr_FR.properties =================================================================== RCS file: /cvsroot/osmose-dev/osmose/resources/localization/osmose_local_fr_FR.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** osmose_local_fr_FR.properties 15 Jan 2006 22:19:34 -0000 1.3 --- osmose_local_fr_FR.properties 17 Feb 2008 22:11:50 -0000 1.4 *************** *** 82,85 **** --- 82,86 ---- SED_SlideDefault=Mise en forme par défaut SED_NotesAreaTitle=Notes + SED_NotesCheckboxTitle=Mettre la liste à puces en notes SED_ModelChoose=Choisissez un modèle SED_BaseModelLabel=Modèle de base |
|
From: Olivier G. <og...@us...> - 2008-02-17 22:11:47
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/common In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6501/src/osmose/application/common Modified Files: OSMFullScreenFrame.java Log Message: Added choice for putting bullet lists in notes (by Fatimatou) Index: OSMFullScreenFrame.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/common/OSMFullScreenFrame.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMFullScreenFrame.java 3 Oct 2007 21:31:13 -0000 1.2 --- OSMFullScreenFrame.java 17 Feb 2008 22:11:50 -0000 1.3 *************** *** 58,87 **** } /** * To create a full screen frame. */ ! public OSMFullScreenFrame() { ! super(); ! setTitle(OSMApplication.Localisation.getString("SVR_Visualisation")); ! m_Running = false; ! m_InFullScreen = false; ! ! ! // Get the default device (Generaly only one device) ! m_Device = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice(); ! ! this.setUndecorated(true); ! this.setIgnoreRepaint(true); ! this.setResizable(false); ! // To know if full screen is supported ! m_FullScreenSupported = m_Device.isFullScreenSupported(); ! /* if(OSMApplication.isMacOsX()) ! { ! m_FullScreenSupported = false; ! setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); ! enableEvents(AWTEvent.WINDOW_EVENT_MASK); ! }*/ ! } --- 58,99 ---- } + /** + * To return the number of screens + */ + protected int getNumberScreen(){ + GraphicsDevice[] gs = GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices(); + return gs.length; + } /** * To create a full screen frame. */ ! ! public OSMFullScreenFrame() { ! super(); ! setTitle(OSMApplication.Localisation.getString("SVR_Visualisation")); ! m_Running = false; ! m_InFullScreen = false; ! GraphicsDevice[] gs = GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices(); ! if(gs.length==1){ ! // Get the default device when there is only one device ! m_Device = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice(); ! ! // To know if full screen is supported ! m_FullScreenSupported = m_Device.isFullScreenSupported(); ! } ! if(gs.length==2){ ! // Get the device ! m_Device = gs[0]; ! m_Device1= gs[1]; ! ! // To know if full screen is supported for the two devices ! m_FullScreenSupported = m_Device.isFullScreenSupported() & m_Device1.isFullScreenSupported(); ! ! } ! this.setUndecorated(true); ! this.setIgnoreRepaint(true); ! this.setResizable(false); ! } *************** *** 115,119 **** setResizable(false); setIgnoreRepaint(true); ! m_Device.setFullScreenWindow(this); } else { // Not supported -> Only windowed mode --- 127,139 ---- setResizable(false); setIgnoreRepaint(true); ! //If there is only one screen ! if(getNumberScreen()==1){ ! m_Device.setFullScreenWindow(this); ! } ! // if there is two screen ! if(getNumberScreen()==2){ ! m_Device.setFullScreenWindow(this); ! m_Device1.setFullScreenWindow(this); ! } } else { // Not supported -> Only windowed mode *************** *** 122,127 **** m_InFullScreen = true; begin2Draw(); ! while(m_Running) ! Thread.sleep(50); } catch(Exception e) {} --- 142,149 ---- m_InFullScreen = true; begin2Draw(); ! if(getNumberScreen()== 1){ ! while(m_Running) ! Thread.sleep(50); ! } } catch(Exception e) {} *************** *** 129,133 **** --- 151,161 ---- if(m_InFullScreen) { if(m_FullScreenSupported) { // Return from full screen mode + if(getNumberScreen()==1){ m_Device.setFullScreenWindow(null); + } + if(getNumberScreen()==2){ + m_Device.setFullScreenWindow(null); + m_Device1.setFullScreenWindow(null); + } hide(); m_InFullScreen = false; *************** *** 159,163 **** setBounds(0, 0, bounds.width, bounds.height); } ! else { Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); --- 187,191 ---- setBounds(0, 0, bounds.width, bounds.height); } ! else { Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); *************** *** 165,172 **** setUndecorated(true); } setVisible(true); toFront(); } ! /** --- 193,210 ---- setUndecorated(true); } + setVisible(true); toFront(); } ! ! /** ! * device where to display the second device ! */ ! private GraphicsDevice m_Device1; ! ! /** ! * Device where to display if there is only one device or for the first device ! */ ! private GraphicsDevice m_Device; /** *************** *** 183,192 **** /** - * Device where to display - */ - private GraphicsDevice m_Device; - - - /** * Thread's life... */ --- 221,224 ---- |
|
From: Olivier G. <og...@us...> - 2008-02-17 22:11:47
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6501/src/osmose/application Modified Files: OSMApplicationFrame.java Log Message: Added choice for putting bullet lists in notes (by Fatimatou) Index: OSMApplicationFrame.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/OSMApplicationFrame.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMApplicationFrame.java 30 Aug 2005 17:43:58 -0000 1.1.1.1 --- OSMApplicationFrame.java 17 Feb 2008 22:11:50 -0000 1.2 *************** *** 200,205 **** if (nbOpenedDoc > 0) { ! OSMMenuFilePrint cmd = new OSMMenuFilePrint(this, OSMApplication.TreeEditor.getDocument()); ! cmd.runCommand(); } } --- 200,207 ---- if (nbOpenedDoc > 0) { ! //OSMMenuFilePrint cmd = new OSMMenuFilePrint(this, OSMApplication.TreeEditor.getDocument()); ! //cmd.runCommand(); ! m_cmdFilePrint =new OSMMenuFilePrint(this, OSMApplication.TreeEditor.getDocument()); ! m_cmdFilePrint.runCommand(); } } *************** *** 542,545 **** --- 544,548 ---- } + public OSMMenuFilePrint m_cmdFilePrint; /** |
|
From: Olivier G. <og...@us...> - 2007-10-03 21:31:42
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/documenteditor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18733/src/osmose/application/documenteditor Modified Files: OSMColorComponent.java OSMElementComponent.java OSMLinkComponent.java OSMTreeEditorColorBar.java OSMTreeEditorFrame.java OSMTreeEditorNavBar.java OSMTreeEditorPanel.java OSMTreeEditorTrashcan.java Log Message: Adapt code for Java 1.6 (some warnings remain) Index: OSMLinkComponent.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/documenteditor/OSMLinkComponent.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMLinkComponent.java 30 Aug 2005 17:44:09 -0000 1.1.1.1 --- OSMLinkComponent.java 3 Oct 2007 21:31:14 -0000 1.2 *************** *** 25,29 **** * <p>Description : This class is a component representing a link between 2 elements.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 25,29 ---- * <p>Description : This class is a component representing a link between 2 elements.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : Quadrille Ingenierie</p> * @author : TD * @version 1.0 Index: OSMElementComponent.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/documenteditor/OSMElementComponent.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMElementComponent.java 30 Aug 2005 17:44:09 -0000 1.1.1.1 --- OSMElementComponent.java 3 Oct 2007 21:31:14 -0000 1.2 *************** *** 32,36 **** * of this class are creating in the OSMTreeEditorPanel.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author TD * @version 1.0 --- 32,36 ---- * of this class are creating in the OSMTreeEditorPanel.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : </p> * @author TD * @version 1.0 Index: OSMTreeEditorNavBar.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/documenteditor/OSMTreeEditorNavBar.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMTreeEditorNavBar.java 30 Aug 2005 17:44:10 -0000 1.1.1.1 --- OSMTreeEditorNavBar.java 3 Oct 2007 21:31:14 -0000 1.2 *************** *** 24,28 **** * <p>Description : Component use to navigate in the tree editor space.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 24,28 ---- * <p>Description : Component use to navigate in the tree editor space.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : Quadrille Ingenierie</p> * @author : TD * @version 1.0 Index: OSMTreeEditorColorBar.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/documenteditor/OSMTreeEditorColorBar.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMTreeEditorColorBar.java 30 Aug 2005 17:44:09 -0000 1.1.1.1 --- OSMTreeEditorColorBar.java 3 Oct 2007 21:31:14 -0000 1.2 *************** *** 30,34 **** * - Move to left, Move to right, return to center...</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 30,34 ---- * - Move to left, Move to right, return to center...</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : Quadrille Ingenierie</p> * @author : TD * @version 1.0 Index: OSMColorComponent.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/documenteditor/OSMColorComponent.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMColorComponent.java 30 Aug 2005 17:44:08 -0000 1.1.1.1 --- OSMColorComponent.java 3 Oct 2007 21:31:14 -0000 1.2 *************** *** 28,32 **** * <p>Description : Component to change tree element color.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 28,32 ---- * <p>Description : Component to change tree element color.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : Quadrille Ingenierie</p> * @author : TD * @version 1.0 *************** *** 183,187 **** * double click on color component.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author non attribuable * @version 1.0 --- 183,187 ---- * double click on color component.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : </p> * @author non attribuable * @version 1.0 Index: OSMTreeEditorFrame.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/documenteditor/OSMTreeEditorFrame.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMTreeEditorFrame.java 30 Aug 2005 17:44:10 -0000 1.1.1.1 --- OSMTreeEditorFrame.java 3 Oct 2007 21:31:14 -0000 1.2 *************** *** 31,35 **** * <p>Description : This class is the frame of the tree editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 31,35 ---- * <p>Description : This class is the frame of the tree editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : Quadrille Ingenierie</p> * @author : TD * @version 1.0 *************** *** 327,331 **** * <p>Description : Background panel of tree editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author TD * @version 1.0 --- 327,331 ---- * <p>Description : Background panel of tree editor.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : </p> * @author TD * @version 1.0 Index: OSMTreeEditorTrashcan.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/documenteditor/OSMTreeEditorTrashcan.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMTreeEditorTrashcan.java 30 Aug 2005 17:44:11 -0000 1.1.1.1 --- OSMTreeEditorTrashcan.java 3 Oct 2007 21:31:14 -0000 1.2 *************** *** 24,28 **** * <p>Description : Component use to retrieve component in trashcan.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 24,28 ---- * <p>Description : Component use to retrieve component in trashcan.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : Quadrille Ingenierie</p> * @author : TD * @version 1.0 Index: OSMTreeEditorPanel.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/documenteditor/OSMTreeEditorPanel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OSMTreeEditorPanel.java 11 Jan 2006 21:27:05 -0000 1.3 --- OSMTreeEditorPanel.java 3 Oct 2007 21:31:14 -0000 1.4 *************** *** 20,24 **** * It permits user to draw tree of his ideas.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : Quadrille Ingénierie</p> * @author : TD * @version 1.0 --- 20,24 ---- * It permits user to draw tree of his ideas.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : Quadrille Ingenierie</p> * @author : TD * @version 1.0 |
|
From: Olivier G. <og...@us...> - 2007-10-03 21:31:42
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/draw In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18733/src/osmose/application/draw Modified Files: OSMDrawingColorComponent.java OSMDrawingColorPanel.java OSMDrawingPanel.java OSMDrawingTextComponent.java OSMDrawingToolsPanel.java OSMImageEditorPanel.java OSMImageSizeSelector.java Log Message: Adapt code for Java 1.6 (some warnings remain) Index: OSMImageEditorPanel.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/draw/OSMImageEditorPanel.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMImageEditorPanel.java 30 Aug 2005 17:44:12 -0000 1.1.1.1 --- OSMImageEditorPanel.java 3 Oct 2007 21:31:14 -0000 1.2 *************** *** 26,30 **** * <p>Description : Image editor panel.</p> * <p>Copyright : Copyright (c) 2004</p> ! * <p>Société : </p> * @author TD * @version 1.0 --- 26,30 ---- * <p>Description : Image editor panel.</p> * <p>Copyright : Copyright (c) 2004</p> ! * <p>Societe : </p> * @author TD * @version 1.0 Index: OSMDrawingPanel.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/draw/OSMDrawingPanel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OSMDrawingPanel.java 31 Jan 2006 19:30:34 -0000 1.3 --- OSMDrawingPanel.java 3 Oct 2007 21:31:14 -0000 1.4 *************** *** 31,35 **** * <p>Description : </p> * <p>Copyright : Copyright (c) 2004</p> ! * <p>Société : </p> * @author non attribuable * @version 1.0 --- 31,35 ---- * <p>Description : </p> * <p>Copyright : Copyright (c) 2004</p> ! * <p>Societe : </p> * @author non attribuable * @version 1.0 Index: OSMDrawingTextComponent.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/draw/OSMDrawingTextComponent.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMDrawingTextComponent.java 30 Aug 2005 17:44:12 -0000 1.1.1.1 --- OSMDrawingTextComponent.java 3 Oct 2007 21:31:14 -0000 1.2 *************** *** 25,29 **** * <p>Description : </p> * <p>Copyright : Copyright (c) 2004</p> ! * <p>Société : </p> * @author non attribuable * @version 1.0 --- 25,29 ---- * <p>Description : </p> * <p>Copyright : Copyright (c) 2004</p> ! * <p>Societe : </p> * @author non attribuable * @version 1.0 Index: OSMImageSizeSelector.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/draw/OSMImageSizeSelector.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMImageSizeSelector.java 30 Aug 2005 17:44:12 -0000 1.1.1.1 --- OSMImageSizeSelector.java 3 Oct 2007 21:31:14 -0000 1.2 *************** *** 29,33 **** * <p>Description : </p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author non attribuable * @version 1.0 --- 29,33 ---- * <p>Description : </p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : </p> * @author non attribuable * @version 1.0 *************** *** 184,186 **** ! } \ No newline at end of file --- 184,186 ---- ! } Index: OSMDrawingColorPanel.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/draw/OSMDrawingColorPanel.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMDrawingColorPanel.java 30 Aug 2005 17:44:12 -0000 1.1.1.1 --- OSMDrawingColorPanel.java 3 Oct 2007 21:31:14 -0000 1.2 *************** *** 24,28 **** * <p>Description : </p> * <p>Copyright : Copyright (c) 2004</p> ! * <p>Société : </p> * @author non attribuable * @version 1.0 --- 24,28 ---- * <p>Description : </p> * <p>Copyright : Copyright (c) 2004</p> ! * <p>Societe : </p> * @author non attribuable * @version 1.0 Index: OSMDrawingToolsPanel.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/draw/OSMDrawingToolsPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMDrawingToolsPanel.java 30 Jan 2006 22:35:33 -0000 1.2 --- OSMDrawingToolsPanel.java 3 Oct 2007 21:31:14 -0000 1.3 *************** *** 27,31 **** * <p>Description : </p> * <p>Copyright : Copyright (c) 2004</p> ! * <p>Société : </p> * @author non attribuable * @version 1.0 --- 27,31 ---- * <p>Description : </p> * <p>Copyright : Copyright (c) 2004</p> ! * <p>Societe : </p> * @author non attribuable * @version 1.0 Index: OSMDrawingColorComponent.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/draw/OSMDrawingColorComponent.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMDrawingColorComponent.java 30 Aug 2005 17:44:12 -0000 1.1.1.1 --- OSMDrawingColorComponent.java 3 Oct 2007 21:31:14 -0000 1.2 *************** *** 26,30 **** * <p>Description : </p> * <p>Copyright : Copyright (c) 2004</p> ! * <p>Société : </p> * @author non attribuable * @version 1.0 --- 26,30 ---- * <p>Description : </p> * <p>Copyright : Copyright (c) 2004</p> ! * <p>Societe : </p> * @author non attribuable * @version 1.0 *************** *** 148,152 **** * double click on color component.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Société : </p> * @author non attribuable * @version 1.0 --- 148,152 ---- * double click on color component.</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Societe : </p> * @author non attribuable * @version 1.0 |
