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
|
|
From: Olivier G. <og...@us...> - 2006-07-07 10:02:13
|
Update of /cvsroot/osmose-dev/osmose In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8895 Modified Files: build.xml Log Message: Correct order in "all" target, and exclusions in "src-dist" target Index: build.xml =================================================================== RCS file: /cvsroot/osmose-dev/osmose/build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** build.xml 6 Jul 2006 14:48:48 -0000 1.6 --- build.xml 7 Jul 2006 10:02:11 -0000 1.7 *************** *** 7,11 **** <property name="javadoc" location="doc/dev/javadoc"/> ! <target name="all" depends="dist,src-dist,javadoc"/> <target name="clean"> --- 7,11 ---- <property name="javadoc" location="doc/dev/javadoc"/> ! <target name="all" depends="clean,javadoc,dist,src-dist"/> <target name="clean"> *************** *** 105,113 **** <fileset dir="."> <exclude name="Osmose-src-${DSTAMP}"/> ! <exclude name="*.tar.gz"/> </fileset> </copy> <tar destfile="Osmose-src-${DSTAMP}.tar.gz" ! basedir="." compression="gzip" longfile="gnu"/> <delete dir="Osmose-src-${DSTAMP}"/> </target> --- 105,115 ---- <fileset dir="."> <exclude name="Osmose-src-${DSTAMP}"/> ! <exclude name="*.tar.gz"/> ! <exclude name="**/CVSROOT/*"/> ! <exclude name="**/CVSROOT/**"/> </fileset> </copy> <tar destfile="Osmose-src-${DSTAMP}.tar.gz" ! basedir="Osmose-src-${DSTAMP}" compression="gzip" longfile="gnu"/> <delete dir="Osmose-src-${DSTAMP}"/> </target> |
|
From: Olivier G. <og...@us...> - 2006-07-07 08:46:47
|
Update of /cvsroot/osmose-dev/osmose/examples/themes In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11845/examples/themes Removed Files: ScorpioRising.theme Spring.theme Log Message: Remove my malformed themes. --- ScorpioRising.theme DELETED --- --- Spring.theme DELETED --- |
|
From: Olivier G. <og...@us...> - 2006-07-06 19:46:32
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/themeeditor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3309/src/osmose/application/themeeditor Modified Files: OSMThemeFormatEditorPanel.java Log Message: B display on the Bold button for MacOSX systems (bug #1428415). Index: OSMThemeFormatEditorPanel.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/themeeditor/OSMThemeFormatEditorPanel.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** OSMThemeFormatEditorPanel.java 17 Nov 2005 22:18:15 -0000 1.4 --- OSMThemeFormatEditorPanel.java 6 Jul 2006 19:46:29 -0000 1.5 *************** *** 376,381 **** m_ToggleBold = new JToggleButton(OSMApplication.Localisation.getString("THE_Bold")); m_ToggleBold.setActionCommand("TOGGLE_BOLD"); - m_ToggleBold.setFont(ft); m_ToggleBold.setPreferredSize(new Dimension(42, 24)); m_ToggleItalic = new JToggleButton(OSMApplication.Localisation.getString("THE_Italic")); m_ToggleItalic.setActionCommand("TOGGLE_ITALIC"); --- 376,381 ---- m_ToggleBold = new JToggleButton(OSMApplication.Localisation.getString("THE_Bold")); m_ToggleBold.setActionCommand("TOGGLE_BOLD"); m_ToggleBold.setPreferredSize(new Dimension(42, 24)); + m_ToggleBold.setFont(ft); m_ToggleItalic = new JToggleButton(OSMApplication.Localisation.getString("THE_Italic")); m_ToggleItalic.setActionCommand("TOGGLE_ITALIC"); |
|
From: Olivier G. <og...@us...> - 2006-07-06 17:12:40
|
Update of /cvsroot/osmose-dev/osmose/resources/localization In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7983/resources/localization Modified Files: osmose_local_en_US.properties Log Message: The bold button has to be named "B" (not "G") in english. Index: osmose_local_en_US.properties =================================================================== RCS file: /cvsroot/osmose-dev/osmose/resources/localization/osmose_local_en_US.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** osmose_local_en_US.properties 15 Jan 2006 22:19:34 -0000 1.3 --- osmose_local_en_US.properties 6 Jul 2006 17:12:36 -0000 1.4 *************** *** 291,295 **** THE_SaveAs=Save as... THE_Close=Close ! THE_Bold=G THE_Italic=I THE_Underlined=U --- 291,295 ---- THE_SaveAs=Save as... THE_Close=Close ! THE_Bold=B THE_Italic=I THE_Underlined=U |
|
From: Olivier G. <og...@us...> - 2006-07-06 16:42:27
|
Update of /cvsroot/osmose-dev/osmose/examples/themes In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28607/examples/themes Added Files: degrade.theme Log Message: Added some examples : presentations and themes (feature request #1359099). --- NEW FILE: degrade.theme --- <?xml version='1.0' encoding='ISO-8859-1'?> <theme soft-version="0.2.0" type="1">Theme <model>BASE <title herited="true" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>103220</size> </font> <color> <red>128</red> <green>192</green> <blue>255</blue> </color> <constraints> <x>46449</x> <y>46449</y> <w>1496690</w> <h>129025</h> </constraints> </title> <body herited="true" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>72254</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> <constraints> <x>46449</x> <y>196118</y> <w>696735</w> <h>949624</h> </constraints> </body> <number herited="true" displayed="false"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>51610</size> </font> <color> <red>204</red> <green>204</green> <blue>204</blue> </color> <constraints> <x>1496690</x> <y>1047683</y> <w>98059</w> <h>149669</h> </constraints> </number> <chips herited="true" displayed="true"> <level num="0">-</level> <level num="1">-</level> <level num="2">-</level> <level num="3">-</level> <level num="4">-</level> </chips> <background herited="true" displayed="true" type="1"> <gradtype>1</gradtype> <color1> <red>0</red> <green>0</green> <blue>0</blue> </color1> <color2> <red>70</red> <green>70</green> <blue>88</blue> </color2> </background> <medias herited="true" displayed="true"> <constraints> <x>799955</x> <y>196118</y> <w>748345</w> <h>748345</h> </constraints> </medias> <texts herited="true"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>61932</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> </texts> </model> <model>Title <title herited="false" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>103220</size> </font> <color> <red>128</red> <green>192</green> <blue>255</blue> </color> <constraints> <x>56771</x> <y>376753</y> <w>1496690</w> <h>242567</h> </constraints> </title> <body herited="false" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>72254</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> <constraints> <x>61932</x> <y>655447</y> <w>1481207</w> <h>505778</h> </constraints> </body> <number herited="false" displayed="false"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>51610</size> </font> <color> <red>204</red> <green>204</green> <blue>204</blue> </color> <constraints> <x>1496690</x> <y>1047683</y> <w>98059</w> <h>149669</h> </constraints> </number> <chips herited="true" displayed="true"> <level num="0">-</level> <level num="1">.</level> <level num="2">*</level> <level num="3">+</level> <level num="4">=</level> </chips> <background herited="true" displayed="true" type="2"> <color1> <red>255</red> <green>255</green> <blue>255</blue> </color1> </background> <medias herited="false" displayed="true"> <constraints> <x>56771</x> <y>41288</y> <w>1496690</w> <h>294177</h> </constraints> </medias> <texts herited="false"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>61932</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> </texts> </model> <model>Picture <title herited="false" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>72254</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> <constraints> <x>51610</x> <y>1006395</y> <w>1496690</w> <h>180635</h> </constraints> </title> <body herited="false" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>72254</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> <constraints> <x>51610</x> <y>36127</y> <w>1496690</w> <h>309660</h> </constraints> </body> <number herited="false" displayed="false"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>51610</size> </font> <color> <red>204</red> <green>204</green> <blue>204</blue> </color> <constraints> <x>1496690</x> <y>1047683</y> <w>98059</w> <h>149669</h> </constraints> </number> <chips herited="true" displayed="true"> <level num="0">-</level> <level num="1">.</level> <level num="2">*</level> <level num="3">+</level> <level num="4">=</level> </chips> <background herited="true" displayed="true" type="2"> <color1> <red>255</red> <green>255</green> <blue>255</blue> </color1> </background> <medias herited="false" displayed="true"> <constraints> <x>56771</x> <y>149669</y> <w>1491529</w> <h>825760</h> </constraints> </medias> <texts herited="false"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>61932</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> </texts> </model> <model>Part <title herited="false" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>103220</size> </font> <color> <red>128</red> <green>192</green> <blue>255</blue> </color> <constraints> <x>51610</x> <y>536744</y> <w>1496690</w> <h>258050</h> </constraints> </title> <body herited="false" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>72254</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> <constraints> <x>51610</x> <y>825760</y> <w>1496690</w> <h>340626</h> </constraints> </body> <number herited="false" displayed="false"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>51610</size> </font> <color> <red>204</red> <green>204</green> <blue>204</blue> </color> <constraints> <x>1496690</x> <y>1047683</y> <w>98059</w> <h>149669</h> </constraints> </number> <chips herited="true" displayed="true"> <level num="0">-</level> <level num="1">.</level> <level num="2">*</level> <level num="3">+</level> <level num="4">=</level> </chips> <background herited="true" displayed="true" type="2"> <color1> <red>255</red> <green>255</green> <blue>255</blue> </color1> </background> <medias herited="false" displayed="true"> <constraints> <x>46449</x> <y>36127</y> <w>1501851</w> <h>474812</h> </constraints> </medias> <texts herited="false"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>61932</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> </texts> </model> </theme> |
|
From: Olivier G. <og...@us...> - 2006-07-06 15:04:37
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19531/src/osmose/application Modified Files: OSMApplication.java Log Message: Version change : 0.2.0 -> 0.2.1 Index: OSMApplication.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/OSMApplication.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMApplication.java 19 Dec 2005 22:19:45 -0000 1.2 --- OSMApplication.java 6 Jul 2006 15:03:44 -0000 1.3 *************** *** 403,407 **** * the version of the application */ ! public static final String OSM_VERSION = "0.2.0"; --- 403,407 ---- * the version of the application */ ! public static final String OSM_VERSION = "0.2.1"; |
|
From: Olivier G. <og...@us...> - 2006-07-06 15:03:48
|
Update of /cvsroot/osmose-dev/osmose/config In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19531/config Modified Files: osmose.properties Log Message: Version change : 0.2.0 -> 0.2.1 Index: osmose.properties =================================================================== RCS file: /cvsroot/osmose-dev/osmose/config/osmose.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** osmose.properties 30 Jan 2006 22:35:32 -0000 1.3 --- osmose.properties 6 Jul 2006 15:03:44 -0000 1.4 *************** *** 1,3 **** ! OSM_Version=0.2.0 OSM_Language=en --- 1,3 ---- ! OSM_Version=0.2.1 OSM_Language=en |
|
From: Olivier G. <og...@us...> - 2006-07-06 14:59:38
|
Update of /cvsroot/osmose-dev/osmose/examples/presentations/photos In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17589/examples/presentations/photos Added Files: photos.osmose Log Message: Added some examples : presentations and themes (feature request #1359099). --- NEW FILE: photos.osmose --- (This appears to be a binary file; contents omitted.) |
|
From: Olivier G. <og...@us...> - 2006-07-06 14:57:49
|
Update of /cvsroot/osmose-dev/osmose/examples/presentations/photos/medias In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15343/examples/presentations/photos/medias Added Files: IMG00023.png IMG00020.png IMG00010.png IMG00016.png IMG00022.png IMG00006.png IMG00013.png IMG00007.png IMG00021.png IMG00011.png IMG00012.png IMG00014.png IMG00017.png IMG00008.png IMG00018.png IMG00019.png IMG00015.png Log Message: Added some examples : presentations and themes (feature request #1359099). --- NEW FILE: IMG00017.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: IMG00016.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: IMG00015.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: IMG00014.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: IMG00013.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: IMG00012.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: IMG00011.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: IMG00010.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: IMG00008.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: IMG00006.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: IMG00019.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: IMG00018.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: IMG00007.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: IMG00022.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: IMG00023.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: IMG00020.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: IMG00021.png --- (This appears to be a binary file; contents omitted.) |
|
From: Olivier G. <og...@us...> - 2006-07-06 14:53:57
|
Update of /cvsroot/osmose-dev/osmose/examples/presentations/photos/theme In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14981/examples/presentations/photos/theme Added Files: photos.theme Log Message: Added some examples : presentations and themes (feature request #1359099). --- NEW FILE: photos.theme --- <?xml version='1.0' encoding='ISO-8859-1'?> <theme soft-version="0.2.0" type="1">Theme <model>BASE <title herited="true" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>103220</size> </font> <color> <red>128</red> <green>192</green> <blue>255</blue> </color> <constraints> <x>46449</x> <y>46449</y> <w>1496690</w> <h>129025</h> </constraints> </title> <body herited="true" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>72254</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> <constraints> <x>46449</x> <y>196118</y> <w>696735</w> <h>949624</h> </constraints> </body> <number herited="true" displayed="false"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>51610</size> </font> <color> <red>204</red> <green>204</green> <blue>204</blue> </color> <constraints> <x>1496690</x> <y>1047683</y> <w>98059</w> <h>149669</h> </constraints> </number> <chips herited="true" displayed="true"> <level num="0">-</level> <level num="1">-</level> <level num="2">-</level> <level num="3">-</level> <level num="4">-</level> </chips> <background herited="true" displayed="true" type="1"> <gradtype>1</gradtype> <color1> <red>0</red> <green>0</green> <blue>0</blue> </color1> <color2> <red>70</red> <green>70</green> <blue>88</blue> </color2> </background> <medias herited="true" displayed="true"> <constraints> <x>799955</x> <y>196118</y> <w>748345</w> <h>748345</h> </constraints> </medias> <texts herited="true"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>61932</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> </texts> </model> <model>Title <title herited="false" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>103220</size> </font> <color> <red>128</red> <green>192</green> <blue>255</blue> </color> <constraints> <x>56771</x> <y>376753</y> <w>1496690</w> <h>242567</h> </constraints> </title> <body herited="false" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>72254</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> <constraints> <x>61932</x> <y>655447</y> <w>1481207</w> <h>505778</h> </constraints> </body> <number herited="false" displayed="false"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>51610</size> </font> <color> <red>204</red> <green>204</green> <blue>204</blue> </color> <constraints> <x>1496690</x> <y>1047683</y> <w>98059</w> <h>149669</h> </constraints> </number> <chips herited="true" displayed="true"> <level num="0">-</level> <level num="1">.</level> <level num="2">*</level> <level num="3">+</level> <level num="4">=</level> </chips> <background herited="true" displayed="true" type="2"> <color1> <red>255</red> <green>255</green> <blue>255</blue> </color1> </background> <medias herited="false" displayed="true"> <constraints> <x>56771</x> <y>41288</y> <w>1496690</w> <h>294177</h> </constraints> </medias> <texts herited="false"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>61932</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> </texts> </model> <model>Picture <title herited="false" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>72254</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> <constraints> <x>51610</x> <y>1006395</y> <w>1496690</w> <h>180635</h> </constraints> </title> <body herited="false" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>72254</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> <constraints> <x>51610</x> <y>36127</y> <w>1496690</w> <h>309660</h> </constraints> </body> <number herited="false" displayed="false"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>51610</size> </font> <color> <red>204</red> <green>204</green> <blue>204</blue> </color> <constraints> <x>1496690</x> <y>1047683</y> <w>98059</w> <h>149669</h> </constraints> </number> <chips herited="true" displayed="true"> <level num="0">-</level> <level num="1">.</level> <level num="2">*</level> <level num="3">+</level> <level num="4">=</level> </chips> <background herited="true" displayed="true" type="2"> <color1> <red>255</red> <green>255</green> <blue>255</blue> </color1> </background> <medias herited="false" displayed="true"> <constraints> <x>56771</x> <y>149669</y> <w>1491529</w> <h>825760</h> </constraints> </medias> <texts herited="false"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>61932</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> </texts> </model> <model>Part <title herited="false" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>103220</size> </font> <color> <red>128</red> <green>192</green> <blue>255</blue> </color> <constraints> <x>51610</x> <y>536744</y> <w>1496690</w> <h>258050</h> </constraints> </title> <body herited="false" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>72254</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> <constraints> <x>51610</x> <y>825760</y> <w>1496690</w> <h>340626</h> </constraints> </body> <number herited="false" displayed="false"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>51610</size> </font> <color> <red>204</red> <green>204</green> <blue>204</blue> </color> <constraints> <x>1496690</x> <y>1047683</y> <w>98059</w> <h>149669</h> </constraints> </number> <chips herited="true" displayed="true"> <level num="0">-</level> <level num="1">.</level> <level num="2">*</level> <level num="3">+</level> <level num="4">=</level> </chips> <background herited="true" displayed="true" type="2"> <color1> <red>255</red> <green>255</green> <blue>255</blue> </color1> </background> <medias herited="false" displayed="true"> <constraints> <x>46449</x> <y>36127</y> <w>1501851</w> <h>474812</h> </constraints> </medias> <texts herited="false"> <font bold="false" italic="false" underlined="false"> <name>sansserif</name> <size>61932</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> </texts> </model> </theme> |
|
From: Olivier G. <og...@us...> - 2006-07-06 14:52:18
|
Update of /cvsroot/osmose-dev/osmose/examples/themes In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14398/examples/themes Added Files: ScorpioRising.theme Log Message: Added some examples : presentations and themes (feature request #1359099). --- NEW FILE: ScorpioRising.theme --- <?xml version='1.0' encoding='ISO-8859-1'?> <theme soft-version="0.2.0" type="1">Theme <model>BASE <title herited="true" displayed="true"> <font bold="true" italic="false" underlined="false"> <name>serif</name> <size>103220</size> </font> <color> <red>0</red> <green>0</green> <blue>0</blue> </color> <constraints> <x>46449</x> <y>46449</y> <w>1496690</w> <h>129025</h> </constraints> </title> <body herited="true" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>serif</name> <size>72254</size> </font> <color> <red>0</red> <green>0</green> <blue>0</blue> </color> <constraints> <x>46449</x> <y>196118</y> <w>696735</w> <h>949624</h> </constraints> </body> <number herited="true" displayed="true"> <font bold="true" italic="false" underlined="false"> <name>serif</name> <size>51610</size> </font> <color> <red>0</red> <green>0</green> <blue>0</blue> </color> <constraints> <x>1496690</x> <y>1047683</y> <w>98059</w> <h>149669</h> </constraints> </number> <chips herited="true" displayed="true"> <level num="0">-</level> <level num="1">.</level> <level num="2">*</level> <level num="3">+</level> <level num="4">=</level> </chips> <background herited="true" displayed="true" type="2"> <color1> <red>255</red> <green>255</green> <blue>255</blue> </color1> </background> <medias herited="true" displayed="true"> <constraints> <x>799955</x> <y>196118</y> <w>748345</w> <h>748345</h> </constraints> </medias> <texts herited="true"> <font bold="false" italic="false" underlined="false"> <name>serif</name> <size>56771</size> </font> <color> <red>0</red> <green>0</green> <blue>0</blue> </color> </texts> </model> <model>ScorpioRising <title herited="false" displayed="true"> <font bold="true" italic="true" underlined="false"> <name>serif</name> <size>103220</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> <constraints> <x>46449</x> <y>46449</y> <w>1496690</w> <h>129025</h> </constraints> </title> <body herited="false" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>serif</name> <size>72254</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> <constraints> <x>46449</x> <y>196118</y> <w>696735</w> <h>949624</h> </constraints> </body> <number herited="false" displayed="true"> <font bold="true" italic="false" underlined="false"> <name>serif</name> <size>51610</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> <constraints> <x>1496690</x> <y>1047683</y> <w>98059</w> <h>149669</h> </constraints> </number> <chips herited="true" displayed="true"> <level num="0">-</level> <level num="1">.</level> <level num="2">*</level> <level num="3">+</level> <level num="4">=</level> </chips> <background herited="false" displayed="true" type="1"> <gradtype>1</gradtype> <color1> <red>204</red> <green>0</green> <blue>0</blue> </color1> <color2> <red>0</red> <green>0</green> <blue>0</blue> </color2> </background> <medias herited="false" displayed="true"> <constraints> <x>799955</x> <y>196118</y> <w>748345</w> <h>748345</h> </constraints> </medias> <texts herited="false"> <font bold="false" italic="false" underlined="false"> <name>serif</name> <size>56771</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> </texts> </model> </theme> |
|
From: Olivier G. <og...@us...> - 2006-07-06 14:51:54
|
Update of /cvsroot/osmose-dev/osmose/examples/themes In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14028/examples/themes Added Files: Spring.theme Log Message: Added some examples : presentations and themes (feature request #1359099). --- NEW FILE: Spring.theme --- <?xml version='1.0' encoding='ISO-8859-1'?> <theme soft-version="0.2.0" type="1">Theme <model>BASE <title herited="true" displayed="true"> <font bold="true" italic="false" underlined="false"> <name>serif</name> <size>103220</size> </font> <color> <red>0</red> <green>0</green> <blue>0</blue> </color> <constraints> <x>46449</x> <y>46449</y> <w>1496690</w> <h>129025</h> </constraints> </title> <body herited="true" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>serif</name> <size>72254</size> </font> <color> <red>0</red> <green>0</green> <blue>0</blue> </color> <constraints> <x>46449</x> <y>196118</y> <w>696735</w> <h>949624</h> </constraints> </body> <number herited="true" displayed="true"> <font bold="true" italic="false" underlined="false"> <name>serif</name> <size>51610</size> </font> <color> <red>0</red> <green>0</green> <blue>0</blue> </color> <constraints> <x>1496690</x> <y>1047683</y> <w>98059</w> <h>149669</h> </constraints> </number> <chips herited="true" displayed="true"> <level num="0">-</level> <level num="1">.</level> <level num="2">*</level> <level num="3">+</level> <level num="4">=</level> </chips> <background herited="true" displayed="true" type="2"> <color1> <red>255</red> <green>255</green> <blue>255</blue> </color1> </background> <medias herited="true" displayed="true"> <constraints> <x>799955</x> <y>196118</y> <w>748345</w> <h>748345</h> </constraints> </medias> <texts herited="true"> <font bold="false" italic="false" underlined="false"> <name>serif</name> <size>56771</size> </font> <color> <red>0</red> <green>0</green> <blue>0</blue> </color> </texts> </model> <model>ScorpioRising <title herited="false" displayed="true"> <font bold="true" italic="true" underlined="false"> <name>serif</name> <size>103220</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> <constraints> <x>46449</x> <y>46449</y> <w>1496690</w> <h>129025</h> </constraints> </title> <body herited="false" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>serif</name> <size>72254</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> <constraints> <x>46449</x> <y>196118</y> <w>696735</w> <h>949624</h> </constraints> </body> <number herited="false" displayed="true"> <font bold="true" italic="false" underlined="false"> <name>serif</name> <size>51610</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> <constraints> <x>1496690</x> <y>1047683</y> <w>98059</w> <h>149669</h> </constraints> </number> <chips herited="true" displayed="true"> <level num="0">-</level> <level num="1">.</level> <level num="2">*</level> <level num="3">+</level> <level num="4">=</level> </chips> <background herited="false" displayed="true" type="1"> <gradtype>1</gradtype> <color1> <red>204</red> <green>0</green> <blue>0</blue> </color1> <color2> <red>0</red> <green>0</green> <blue>0</blue> </color2> </background> <medias herited="false" displayed="true"> <constraints> <x>799955</x> <y>196118</y> <w>748345</w> <h>748345</h> </constraints> </medias> <texts herited="false"> <font bold="false" italic="false" underlined="false"> <name>serif</name> <size>56771</size> </font> <color> <red>255</red> <green>255</green> <blue>255</blue> </color> </texts> </model> <model>Spring <title herited="false" displayed="true"> <font bold="true" italic="false" underlined="false"> <name>serif</name> <size>103220</size> </font> <color> <red>255</red> <green>255</green> <blue>200</blue> </color> <constraints> <x>46449</x> <y>46449</y> <w>1496690</w> <h>129025</h> </constraints> </title> <body herited="false" displayed="true"> <font bold="false" italic="false" underlined="false"> <name>serif</name> <size>72254</size> </font> <color> <red>255</red> <green>223</green> <blue>140</blue> </color> <constraints> <x>46449</x> <y>196118</y> <w>696735</w> <h>949624</h> </constraints> </body> <number herited="false" displayed="true"> <font bold="true" italic="false" underlined="false"> <name>serif</name> <size>51610</size> </font> <color> <red>255</red> <green>227</green> <blue>140</blue> </color> <constraints> <x>1496690</x> <y>1047683</y> <w>98059</w> <h>149669</h> </constraints> </number> <chips herited="true" displayed="true"> <level num="0">-</level> <level num="1">.</level> <level num="2">*</level> <level num="3">+</level> <level num="4">=</level> </chips> <background herited="false" displayed="true" type="1"> <gradtype>1</gradtype> <color1> <red>51</red> <green>204</green> <blue>255</blue> </color1> <color2> <red>0</red> <green>153</green> <blue>0</blue> </color2> </background> <medias herited="false" displayed="true"> <constraints> <x>799955</x> <y>196118</y> <w>748345</w> <h>748345</h> </constraints> </medias> <texts herited="false"> <font bold="false" italic="false" underlined="false"> <name>serif</name> <size>56771</size> </font> <color> <red>255</red> <green>214</green> <blue>143</blue> </color> </texts> </model> </theme> |
|
From: Olivier G. <og...@us...> - 2006-07-06 14:48:53
|
Update of /cvsroot/osmose-dev/osmose/examples/presentations In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11722/examples/presentations Log Message: Directory /cvsroot/osmose-dev/osmose/examples/presentations added to the repository |
|
From: Olivier G. <og...@us...> - 2006-07-06 14:48:50
|
Update of /cvsroot/osmose-dev/osmose In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12640 Modified Files: build.xml Log Message: Added some examples : presentations and themes (feature request #1359099). Index: build.xml =================================================================== RCS file: /cvsroot/osmose-dev/osmose/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** build.xml 25 Nov 2005 22:23:13 -0000 1.5 --- build.xml 6 Jul 2006 14:48:48 -0000 1.6 *************** *** 65,68 **** --- 65,71 ---- <fileset dir="resources"/> </copy> + <copy todir="${dist}/Osmose-${DSTAMP}/examples"> + <fileset dir="examples"/> + </copy> <copy todir="${dist}/Osmose-${DSTAMP}/lib"> <!-- ui.jar is only needed for compilation purpose --> |
|
From: Olivier G. <og...@us...> - 2006-07-06 14:48:12
|
Update of /cvsroot/osmose-dev/osmose/examples In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11722/examples Log Message: Directory /cvsroot/osmose-dev/osmose/examples added to the repository |
|
From: Olivier G. <og...@us...> - 2006-07-06 14:48:01
|
Update of /cvsroot/osmose-dev/osmose/examples/presentations/photos/medias In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11722/examples/presentations/photos/medias Log Message: Directory /cvsroot/osmose-dev/osmose/examples/presentations/photos/medias added to the repository |
|
From: Olivier G. <og...@us...> - 2006-07-06 14:47:27
|
Update of /cvsroot/osmose-dev/osmose/examples/presentations/photos In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11722/examples/presentations/photos Log Message: Directory /cvsroot/osmose-dev/osmose/examples/presentations/photos added to the repository |
|
From: Olivier G. <og...@us...> - 2006-07-06 14:47:08
|
Update of /cvsroot/osmose-dev/osmose/examples/themes In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11722/examples/themes Log Message: Directory /cvsroot/osmose-dev/osmose/examples/themes added to the repository |
|
From: Olivier G. <og...@us...> - 2006-07-06 14:47:04
|
Update of /cvsroot/osmose-dev/osmose/examples/presentations/photos/theme In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11722/examples/presentations/photos/theme Log Message: Directory /cvsroot/osmose-dev/osmose/examples/presentations/photos/theme added to the repository |
|
From: Olivier G. <og...@us...> - 2006-07-06 14:24:54
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/export In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1174/src/osmose/application/export Modified Files: OSMExportHTML.java Log Message: Select good fonts for mac systems (bugs #1277552 and #1442631). Index: OSMExportHTML.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/export/OSMExportHTML.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** OSMExportHTML.java 19 Dec 2005 22:03:16 -0000 1.4 --- OSMExportHTML.java 6 Jul 2006 14:24:50 -0000 1.5 *************** *** 1109,1115 **** * Dialog and dialoginput are different from cursive and fantasy, but in Sun * JRE they use the same font as sansserif and monospaced (respectively). ! * ! * Physical fonts are quoted, but not generic CSS fonts, according to CSS ! * specifications. * * @param javaFont the Java font to be converted --- 1109,1115 ---- * Dialog and dialoginput are different from cursive and fantasy, but in Sun * JRE they use the same font as sansserif and monospaced (respectively). ! * ! * Physical fonts are quoted, but not generic CSS fonts, according to CSS ! * specifications. * * @param javaFont the Java font to be converted *************** *** 1118,1122 **** public String convertJavaFontToCSSFont(Font javaFont) { ! String javaFt = javaFont.getName(); String cssFont = "\"" + javaFt + "\""; if (javaFt.equals("sansserif")) cssFont = "sans-serif"; --- 1118,1126 ---- public String convertJavaFontToCSSFont(Font javaFont) { ! // for MacOS systems, the font name must be the one returned by ! // getFamily, in order to keep white spaces. ! String javaFt = javaFont.getName(); ! if(System.getProperty("os.name").toLowerCase().startsWith("mac")) ! javaFt = javaFont.getFamily(); String cssFont = "\"" + javaFt + "\""; if (javaFt.equals("sansserif")) cssFont = "sans-serif"; |
|
From: Olivier G. <og...@us...> - 2006-07-06 13:35:45
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/file In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13579/src/osmose/application/file Modified Files: OSMFileLoad.java Log Message: Fixed opening presentations containing an empty property Index: OSMFileLoad.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/file/OSMFileLoad.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMFileLoad.java 30 Aug 2005 17:44:16 -0000 1.1.1.1 --- OSMFileLoad.java 6 Jul 2006 13:35:40 -0000 1.2 *************** *** 165,170 **** m_OSMDocument.getPresentation().setTitleIncluded( getPropertyInclude(n)); ! m_OSMDocument.getPresentation().setTitle(getStringCleaned(n. ! getFirstChild().getNodeValue())); m_OSMDocument.getTitleElement().setTitle(getStringCleaned( m_OSMDocument.getPresentation().getTitle())); --- 165,173 ---- m_OSMDocument.getPresentation().setTitleIncluded( getPropertyInclude(n)); ! if (n.getFirstChild()!=null) ! m_OSMDocument.getPresentation().setTitle(getStringCleaned(n. ! getFirstChild().getNodeValue())); ! else ! m_OSMDocument.getPresentation().setTitle(""); m_OSMDocument.getTitleElement().setTitle(getStringCleaned( m_OSMDocument.getPresentation().getTitle())); *************** *** 174,179 **** m_OSMDocument.getPresentation().setAuthorNameIncluded( getPropertyInclude(n)); ! m_OSMDocument.getPresentation().setAuthorName( ! getStringCleaned(n.getFirstChild().getNodeValue())); } else --- 177,185 ---- m_OSMDocument.getPresentation().setAuthorNameIncluded( getPropertyInclude(n)); ! if (n.getFirstChild()!=null) ! m_OSMDocument.getPresentation().setAuthorName( ! getStringCleaned(n.getFirstChild().getNodeValue())); ! else ! m_OSMDocument.getPresentation().setAuthorName(""); } else *************** *** 181,186 **** m_OSMDocument.getPresentation().setAuthorOrganismIncluded( getPropertyInclude(n)); ! m_OSMDocument.getPresentation().setAuthorOrganism( ! getStringCleaned(n.getFirstChild().getNodeValue())); } else --- 187,195 ---- m_OSMDocument.getPresentation().setAuthorOrganismIncluded( getPropertyInclude(n)); ! if (n.getFirstChild()!=null) ! m_OSMDocument.getPresentation().setAuthorOrganism( ! getStringCleaned(n.getFirstChild().getNodeValue())); ! else ! m_OSMDocument.getPresentation().setAuthorOrganism(""); } else *************** *** 188,193 **** m_OSMDocument.getPresentation().setAuthorAddressIncluded( getPropertyInclude(n)); ! m_OSMDocument.getPresentation().setAuthorAddress( ! getStringCleaned(n.getFirstChild().getNodeValue())); } else --- 197,205 ---- m_OSMDocument.getPresentation().setAuthorAddressIncluded( getPropertyInclude(n)); ! if (n.getFirstChild()!=null) ! m_OSMDocument.getPresentation().setAuthorAddress( ! getStringCleaned(n.getFirstChild().getNodeValue())); ! else ! m_OSMDocument.getPresentation().setAuthorAddress(""); } else *************** *** 195,200 **** m_OSMDocument.getPresentation().setVersionNumberIncluded( getPropertyInclude(n)); ! m_OSMDocument.getPresentation().setVersionNumber( ! getStringCleaned(n.getFirstChild().getNodeValue())); } else --- 207,215 ---- m_OSMDocument.getPresentation().setVersionNumberIncluded( getPropertyInclude(n)); ! if (n.getFirstChild()!=null) ! m_OSMDocument.getPresentation().setVersionNumber( ! getStringCleaned(n.getFirstChild().getNodeValue())); ! else ! m_OSMDocument.getPresentation().setVersionNumber(""); } else *************** *** 202,207 **** m_OSMDocument.getPresentation().setVersionDateIncluded( getPropertyInclude(n)); ! m_OSMDocument.getPresentation().setVersionDate( ! getStringCleaned(n.getFirstChild().getNodeValue())); } else --- 217,225 ---- m_OSMDocument.getPresentation().setVersionDateIncluded( getPropertyInclude(n)); ! if (n.getFirstChild()!=null) ! m_OSMDocument.getPresentation().setVersionDate( ! getStringCleaned(n.getFirstChild().getNodeValue())); ! else ! m_OSMDocument.getPresentation().setVersionDate(""); } else *************** *** 209,214 **** m_OSMDocument.getPresentation().setKeywordsIncluded( getPropertyInclude(n)); ! m_OSMDocument.getPresentation().setKeywords(n.getFirstChild(). ! getNodeValue()); } else --- 227,235 ---- m_OSMDocument.getPresentation().setKeywordsIncluded( getPropertyInclude(n)); ! if (n.getFirstChild()!=null) ! m_OSMDocument.getPresentation().setKeywords(n.getFirstChild(). ! getNodeValue()); ! else ! m_OSMDocument.getPresentation().setKeywords(""); } else *************** *** 216,221 **** m_OSMDocument.getPresentation().setResumeIncluded( getPropertyInclude(n)); ! m_OSMDocument.getPresentation().setResume(n.getFirstChild(). ! getNodeValue()); } else --- 237,245 ---- m_OSMDocument.getPresentation().setResumeIncluded( getPropertyInclude(n)); ! if (n.getFirstChild()!=null) ! m_OSMDocument.getPresentation().setResume(n.getFirstChild(). ! getNodeValue()); ! else ! m_OSMDocument.getPresentation().setResume(""); } else *************** *** 223,228 **** m_OSMDocument.getPresentation().setPurposeIncluded( getPropertyInclude(n)); ! m_OSMDocument.getPresentation().setPurpose(n.getFirstChild(). ! getNodeValue()); } else --- 247,255 ---- m_OSMDocument.getPresentation().setPurposeIncluded( getPropertyInclude(n)); ! if (n.getFirstChild()!=null) ! m_OSMDocument.getPresentation().setPurpose(n.getFirstChild(). ! getNodeValue()); ! else ! m_OSMDocument.getPresentation().setPurpose(""); } else |
|
From: Olivier G. <og...@us...> - 2006-02-01 19:26:10
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/file In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9843/src/osmose/application/file Modified Files: OSMFile.java Log Message: Files from Osmose 0.1 can be read by Osmose 0.2. Index: OSMFile.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/file/OSMFile.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMFile.java 30 Aug 2005 17:44:15 -0000 1.1.1.1 --- OSMFile.java 1 Feb 2006 19:25:57 -0000 1.2 *************** *** 307,318 **** public boolean verifySoftwareVersion(String version) { ! // in fact we check the first numbers of the version // for example, soft version is 0.1.31 and file version is 0.1.28 // then we authorized osmose to open the file ! // (when the soft version will be 0.2.0 and file version 0.1.40 it will be wrong) boolean bRet = false; ! int indexVersion = version.lastIndexOf("."); ! String truncateVersion = version.substring(0,indexVersion); ! if(OSMApplication.OSM_VERSION.startsWith(truncateVersion)) { bRet = true; --- 307,325 ---- public boolean verifySoftwareVersion(String version) { ! // in fact we check the first two numbers of the version // for example, soft version is 0.1.31 and file version is 0.1.28 // then we authorized osmose to open the file ! // A file with a greater version than the software cannot be opened. boolean bRet = false; ! ! String[] fileVersion = version.split("\\."); ! String[] softVersion = OSMApplication.OSM_VERSION.split("\\."); ! int fileVersion0 = new Integer(fileVersion[0]).intValue(); ! int fileVersion1 = new Integer(fileVersion[1]).intValue(); ! int softVersion0 = new Integer(softVersion[0]).intValue(); ! int softVersion1 = new Integer(softVersion[1]).intValue(); ! ! if ( (fileVersion0 < softVersion0) ! || (fileVersion0==softVersion0 && fileVersion1<=softVersion1)) { bRet = true; |
|
From: Olivier G. <og...@us...> - 2006-01-31 19:30:46
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/draw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8792/src/osmose/application/draw Modified Files: OSMDrawingPanel.java Log Message: Drawing tools size synchronized with user choice. Index: OSMDrawingPanel.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/draw/OSMDrawingPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMDrawingPanel.java 30 Jan 2006 22:35:33 -0000 1.2 --- OSMDrawingPanel.java 31 Jan 2006 19:30:34 -0000 1.3 *************** *** 92,95 **** --- 92,99 ---- if(m_Tools != null) { g.setColor(m_Colors.getCurrentColor()); + if (g instanceof Graphics2D) { + Graphics2D g2 = (Graphics2D)g; + g2.setStroke(new BasicStroke(new Integer(m_Tools.getPenSize()).floatValue())); + } if(m_Tools.getCurrentTool() == OSMDrawingToolsPanel.OSMDRAW_RECT) drawARect(g, m_X, m_Y, m_W, m_H); *************** *** 122,125 **** --- 126,133 ---- g.setColor(m_Colors.getCurrentColor()); m_ImgGraphic.setColor(m_Colors.getCurrentColor()); + if (m_ImgGraphic instanceof Graphics2D) { + Graphics2D g2 = (Graphics2D)m_ImgGraphic; + g2.setStroke(new BasicStroke(new Integer(m_Tools.getPenSize()).floatValue())); + } drawALine(g, m_X0, m_Y0, e.getX(), e.getY()); drawALine(m_ImgGraphic, m_X0, m_Y0, e.getX(), e.getY()); *************** *** 130,133 **** --- 138,145 ---- if(m_Tools.getCurrentTool() == OSMDrawingToolsPanel.OSMDRAW_ERASE) { m_ImgGraphic.setColor(Color.WHITE); + if (m_ImgGraphic instanceof Graphics2D) { + Graphics2D g2 = (Graphics2D)m_ImgGraphic; + g2.setStroke(new BasicStroke(new Integer(m_Tools.getPenSize()).floatValue())); + } g.setColor(Color.WHITE); int eraserSize = m_Tools.getPenSize(); *************** *** 149,152 **** --- 161,168 ---- if(m_ImgGraphic != null) { m_ImgGraphic.setColor(m_Colors.getCurrentColor()); + if (m_ImgGraphic instanceof Graphics2D) { + Graphics2D g2 = (Graphics2D)m_ImgGraphic; + g2.setStroke(new BasicStroke(new Integer(m_Tools.getPenSize()).floatValue())); + } if(m_Tools.getCurrentTool() == OSMDrawingToolsPanel.OSMDRAW_RECT) drawARect(m_ImgGraphic, m_X, m_Y, m_W, m_H); *************** *** 359,386 **** { g.drawOval(x, y, w, h); - if(m_Tools.getPenSize() > 1) - { - g.drawOval(x + 1, y, w - 2, h); - g.drawOval(x, y + 1, w, h - 2); - if (m_Tools.getPenSize() > 2) - { - g.drawOval(x - 1, y, w + 2, h); - g.drawOval(x, y - 1, w, h + 2); - } - } - - /* g.drawOval(x, y, w, h); - if(m_Tools.getPenSize() > 1) - { - g.drawOval(x, y + 1, w, h - 2); - g.drawOval(x + 1, y, w - 2, h); - g.drawOval(x + 1, y+1, w - 2, h-2); - if(m_Tools.getPenSize() > 2) - { - g.drawOval(x, y - 1, w, h + 2); - g.drawOval(x - 1, y, w + 2, h); - g.drawOval(x - 1, y-1, w + 2, h+2); - } - }*/ } --- 375,378 ---- *************** *** 396,418 **** private void drawALine(Graphics g, int x1, int y1, int x2, int y2) { g.drawLine(x1, y1, x2, y2); - float pente = 0; - if(x1 != x2) - pente = (float)Math.abs(y2 - y1) / Math.abs(x2 - x1); - else - pente = 1000; - if(pente < 1) { - if(m_Tools.getPenSize() > 1) { - g.drawLine(x1, y1 - 1, x2, y2 - 1); - if(m_Tools.getPenSize() > 2) - g.drawLine(x1, y1 + 1, x2, y2 + 1); - } - } - else { - if(m_Tools.getPenSize() > 1) { - g.drawLine(x1 - 1, y1, x2 - 1, y2); - if(m_Tools.getPenSize() > 2) - g.drawLine(x1 + 1, y1, x2 + 1, y2); - } - } } --- 388,391 ---- *************** *** 483,491 **** private void drawARect(Graphics g, int x, int y, int w, int h) { g.drawRect(x, y, w, h); - if(m_Tools.getPenSize() > 1) { - g.drawRect(x + 1, y + 1, w - 2, h - 2); - if(m_Tools.getPenSize() > 2) - g.drawRect(x - 1, y - 1, w + 2, h + 2); - } } --- 456,459 ---- |
|
From: Olivier G. <og...@us...> - 2006-01-30 22:59:49
|
Update of /cvsroot/osmose-dev/osmose/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32264/lib Modified Files: ui.jar Log Message: Updated ui.jar with version 1.4.2_09 Index: ui.jar =================================================================== RCS file: /cvsroot/osmose-dev/osmose/lib/ui.jar,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 Binary files /tmp/cvsvE8JYZ and /tmp/cvsGRpGP9 differ |
|
From: Olivier G. <og...@us...> - 2006-01-30 22:35:44
|
Update of /cvsroot/osmose-dev/osmose/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23722/config Modified Files: osmose.properties Log Message: Eraser size (1 to 32) can be set in the drawing editor Index: osmose.properties =================================================================== RCS file: /cvsroot/osmose-dev/osmose/config/osmose.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** osmose.properties 19 Dec 2005 22:19:44 -0000 1.2 --- osmose.properties 30 Jan 2006 22:35:32 -0000 1.3 *************** *** 82,86 **** OSM_MediaShiftPercentage=20 - OSM_DrawEraserSize=10 OSM_DoubleClicTime=400 --- 82,85 ---- |
