Author: tchemit Date: 2010-07-02 12:21:20 +0200 (Fri, 02 Jul 2010) New Revision: 2022 Url: http://nuiton.org/repositories/revision/jaxx/2022 Log: fix tutorial poms + improve css tutorial Added: trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/Css.css trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/Css.jaxx Removed: trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/css.jaxx trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/tuto.css Modified: trunk/jaxx-tutorial-css/pom.xml trunk/jaxx-tutorial-databinding/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/src/site/rst/tutos/css.rst Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2010-07-02 10:12:28 UTC (rev 2021) +++ trunk/jaxx-tutorial-css/pom.xml 2010-07-02 10:21:20 UTC (rev 2022) @@ -49,8 +49,7 @@ <!-- main class to run --> - <maven.jar.main.class>org.nuiton.jaxx.tutorials.css.css - </maven.jar.main.class> + <maven.jar.main.class>org.nuiton.jaxx.tutorials.css.css</maven.jar.main.class> <!-- compiler configuration --> Copied: trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/Css.css (from rev 2020, trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/tuto.css) =================================================================== --- trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/Css.css (rev 0) +++ trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/Css.css 2010-07-02 10:21:20 UTC (rev 2022) @@ -0,0 +1,17 @@ +JLabel { + font-size:20; + foreground:red; + text:"Hello World"; +} + +#hello:mouseover { + foreground:green; +} + +#tuto { + title:"CSS Tutorial"; +} + +#button { + text:"Close" +} \ No newline at end of file Property changes on: trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/Css.css ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Copied: trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/Css.jaxx (from rev 2020, trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/css.jaxx) =================================================================== --- trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/Css.jaxx (rev 0) +++ trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/Css.jaxx 2010-07-02 10:21:20 UTC (rev 2022) @@ -0,0 +1,12 @@ + <Application id='tuto'> + + <!--<style source='Css.css'/>--> + + <JLabel id='hello' + constraints='BorderLayout.NORTH'/> + + <JButton id='button' + constraints='BorderLayout.SOUTH' + onActionPerformed='dispose()'/> + + </Application> Property changes on: trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/Css.jaxx ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Deleted: trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/css.jaxx =================================================================== --- trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/css.jaxx 2010-07-02 10:12:28 UTC (rev 2021) +++ trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/css.jaxx 2010-07-02 10:21:20 UTC (rev 2022) @@ -1,12 +0,0 @@ - <Application id='tuto'> - - <style source='tuto.css'/> - - <JLabel id='hello' - constraints='BorderLayout.NORTH'/> - - <JButton id='button' - constraints='BorderLayout.SOUTH' - onActionPerformed='dispose()'/> - - </Application> Deleted: trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/tuto.css =================================================================== --- trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/tuto.css 2010-07-02 10:12:28 UTC (rev 2021) +++ trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/tuto.css 2010-07-02 10:21:20 UTC (rev 2022) @@ -1,17 +0,0 @@ -JLabel { - font-size:20; - foreground:red; - text:"Hello World"; -} - -#hello:mouseover { - foreground:green; -} - -#tuto { - title:"CSS Tutorial"; -} - -#button { - text:"Close" -} \ No newline at end of file Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2010-07-02 10:12:28 UTC (rev 2021) +++ trunk/jaxx-tutorial-databinding/pom.xml 2010-07-02 10:21:20 UTC (rev 2022) @@ -25,7 +25,7 @@ <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> - <version>${jaxx.version}</version> + <version>${project.version}</version> </dependency> </dependencies> @@ -47,10 +47,6 @@ <properties> - <!-- Jaxx version --> - - <jaxx.version>${project.version}</jaxx.version> - <!-- main class to run --> <maven.jar.main.class>org.nuiton.jaxx.tutorials.databinding.databinding</maven.jar.main.class> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2010-07-02 10:12:28 UTC (rev 2021) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2010-07-02 10:21:20 UTC (rev 2022) @@ -55,10 +55,6 @@ <properties> - <!-- Jaxx version --> - - <jaxx.version>${project.version}</jaxx.version> - <!-- main class to run --> <maven.jar.main.class>org.nuiton.jaxx.tutorials.helloworld.helloworld</maven.jar.main.class> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2010-07-02 10:12:28 UTC (rev 2021) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2010-07-02 10:21:20 UTC (rev 2022) @@ -54,10 +54,6 @@ <properties> - <!-- Jaxx version --> - - <jaxx.version>${project.version}</jaxx.version> - <!-- main class to run --> <maven.jar.main.class>org.nuiton.jaxx.tutorials.helloworld.helloworld</maven.jar.main.class> Modified: trunk/src/site/rst/tutos/css.rst =================================================================== --- trunk/src/site/rst/tutos/css.rst 2010-07-02 10:12:28 UTC (rev 2021) +++ trunk/src/site/rst/tutos/css.rst 2010-07-02 10:21:20 UTC (rev 2022) @@ -67,7 +67,7 @@ que notre fichier JAXX. Nous allons référencer la feuille de style dans notre fichier JAXX en rajoutant le code suivant en fils de notre tag Application:: - <style source='tuto.css'/> + <style source='Css.css'/> Dans la feuille de style, il faut retrouver le même niveau que lors du premier tutoriel. Nous allons donc commencer par notre Application et lui donner un