ktutorial-commits Mailing List for KTutorial
Status: Alpha
Brought to you by:
danxuliu
You can subscribe to this list here.
2010 |
Jan
(1) |
Feb
(36) |
Mar
(117) |
Apr
(11) |
May
(8) |
Jun
(1) |
Jul
|
Aug
(2) |
Sep
(21) |
Oct
(16) |
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2011 |
Jan
(1) |
Feb
|
Mar
(6) |
Apr
(6) |
May
(15) |
Jun
(15) |
Jul
(6) |
Aug
|
Sep
(1) |
Oct
(4) |
Nov
|
Dec
|
2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(10) |
Jul
(4) |
Aug
(29) |
Sep
(4) |
Oct
|
Nov
|
Dec
(2) |
From: <dan...@us...> - 2012-12-07 11:45:51
|
Revision: 390 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=390&view=rev Author: danxuliu Date: 2012-12-07 11:45:42 +0000 (Fri, 07 Dec 2012) Log Message: ----------- Update download page with Git instructions instead of SVN instructions. Modified Paths: -------------- trunk/web-src/pages/download.xml Modified: trunk/web-src/pages/download.xml =================================================================== --- trunk/web-src/pages/download.xml 2012-12-07 10:43:32 UTC (rev 389) +++ trunk/web-src/pages/download.xml 2012-12-07 11:45:42 UTC (rev 390) @@ -10,7 +10,7 @@ <ul> <li><a href="#releases">Releases</a></li> - <li><a href="#svnDownload">Downloading from <acronym title="Subversion">SVN</acronym></a></li> + <li><a href="#gitDownload">Downloading from Git</a></li> <li><a href="#build">Building</a></li> </ul> @@ -21,27 +21,28 @@ <p>You can also see the <a href="http://sourceforge.net/projects/ktutorial/files/ktutorial-0.5.1/README/view" title="KTutorial 0.5.1 release notes">release notes</a>, which list the changes from the previous release.</p> <p>See below for build instructions, in <a href="#build" title="Build instructions">building section</a>.</p> - <p>If you do know what you are doing ;) , you can also checkout KTutorial sources from <acronym title="Subversion">SVN</acronym> repository. Go on reading to know how to do it.</p> + <p>If you do know what you are doing ;) , you can also checkout KTutorial sources from Git repository. Go on reading to know how to do it.</p> <div class="h2Rounded"> - <h2><a id="svnDownload" class="anchorLink">Downloading from <acronym title="Subversion">SVN</acronym></a></h2> + <h2><a id="gitDownload" class="anchorLink">Downloading from Git</a></h2> </div> - <p>In order to download the sourcecode from <acronym title="Subversion">SVN</acronym>, you'll need a <acronym title="Subversion">SVN</acronym> client.</p> + <p>In order to download the sourcecode from Git, you'll need a Git client. If you just want to browse the repository from your web browser without downloading it, please see the <a href="https://projects.kde.org/projects/playground/libs/ktutorial/repository" title="KTutorial Repository in KDE Projects">KDE Projects page for KTutorial</a>.</p> <p>You can check out the sourcecode anonymously in this way:</p> <ul> - <li>Via SVN: <strong>svn checkout https://ktutorial.svn.sourceforge.net/svnroot/ktutorial/trunk/ktutorial</strong></li> + <li>Via Git: <strong>git clone git://anongit.kde.org/ktutorial</strong></li> </ul> <p>That command, typed in a terminal, will create a subdirectory named <em>ktutorial</em> in the directory it was executed, and it will download in the <em>ktutorial</em> subdirectory the sourcecode.</p> + <p>Note that the translations are not included when the sources are downloaded from Git (although they are when downloading a release package). To get the translations in this case you must <a href="http://techbase.kde.org/Development/Tutorials/Localization/Building_KDE%27s_l10n_Module" title="Building KDE's l10n Module article in TechBase">build KDE's l10n module</a>.</p> <div class="h2Rounded"> <h2><a id="build" class="anchorLink">Building</a></h2> </div> - <p>In order to build KTutorial, it doesn't matter if you downloaded it from a release or from <acronym title="Subversion">SVN</acronym>.</p> + <p>In order to build KTutorial, it doesn't matter if you downloaded it from a release or from Git.</p> <p>You will need <a href="http://www.cmake.org" title="CMake project web">CMake</a>, and Qt >= 4.6 and KDE 4 kdelibs development packages installed in your system. It can be built like any other KDE 4 library or application.</p> <p>Create a <em>build</em> subdirectory in <em>ktutorial</em> directory, and change to it. Now, in a terminal, just run <strong>cmake ../ && make</strong> and it will configure and build KTutorial in the <em>build</em> directory. Once built, execute <strong>make install</strong> and you are done (you will likely need to change to root user, as default KDE installation is usually only root writable).</p> <p>If you want to specify a prefix to install KTutorial to, instead of using KDE default installation directory, call CMake using the parameter <strong>-DCMAKE_INSTALL_PREFIX=/installation/prefix</strong>. For debugging purposes, use <strong>-DCMAKE_BUILD_TYPE=debugfull</strong>. If you want to prevent some directory to be built (for example, the one for the test application), use <strong>BUILD_ktutorial-test-app=NO</strong>. To automatically build the unit tests when the project is built, use <strong>-DKDE4_BUILD_TESTS=ON</strong>.</p> <p>If you intend to run the unit tests you may find this little trick valuable: <a href="http://ktutorial.wordpress.com/2012/12/06/preventing-graphical-automated-tests-from-interrupting-you/" title="Preventing graphical automated tests from interrupting you article in KTutorial project blog">Preventing graphical automated tests from interrupting you</a>.</p> - <p class="lastUpdated">Last updated: 2012-12-06</p> + <p class="lastUpdated">Last updated: 2012-12-07</p> </page:content> </page> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-12-07 10:43:39
|
Revision: 389 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=389&view=rev Author: danxuliu Date: 2012-12-07 10:43:32 +0000 (Fri, 07 Dec 2012) Log Message: ----------- Update pages for 0.5.1 release. Modified Paths: -------------- trunk/web-src/newsList.xml trunk/web-src/pages/download.xml trunk/web-src/pages/index.xml trunk/web-src/pages/news.xml Modified: trunk/web-src/newsList.xml =================================================================== --- trunk/web-src/newsList.xml 2012-09-04 22:38:45 UTC (rev 388) +++ trunk/web-src/newsList.xml 2012-12-07 10:43:32 UTC (rev 389) @@ -92,4 +92,19 @@ <date>2012-09-04</date> </fullDate> </new> + + <new> + <title>KTutorial 0.5.1 released!</title> + <summary> + <div xmlns="http://www.w3.org/1999/xhtml"> + <p>This is the first release licensed under the GPLv2+, and the first one containing translations provided by the KDE localization teams (thank you for your work! :) ).</p> + <p>The <a href="http://sourceforge.net/projects/ktutorial/files/ktutorial-0.5.1/README/view" title="KTutorial 0.5.1 release notes">release notes</a> contain more information about the changes from 0.5 release.</p> + <p>Check the <a href="download.html" title="Download page in KTutorial web">download page</a> for information about downloading and building KTutorial.</p> + <p>And yes, I know, I have a very loose concept of "soon" :P</p> + </div> + </summary> + <fullDate> + <date>2012-12-06</date> + </fullDate> + </new> </news> Modified: trunk/web-src/pages/download.xml =================================================================== --- trunk/web-src/pages/download.xml 2012-09-04 22:38:45 UTC (rev 388) +++ trunk/web-src/pages/download.xml 2012-12-07 10:43:32 UTC (rev 389) @@ -17,8 +17,8 @@ <div class="h2Rounded"> <h2><a id="releases" class="anchorLink">Releases</a></h2> </div> - <p>Current release is 0.5. You can download <a href="http://sourceforge.net/projects/ktutorial/files/ktutorial-0.5/ktutorial-0.5.tar.gz/download" title="KTutorial 0.5 release in tar.gz">ktutorial-0.5.tar.gz</a> from <a href="http://sourceforge.net/projects/ktutorial/files/" title="KTutorial project files">project's file list</a>.</p> - <p>You can also see the <a href="http://sourceforge.net/projects/ktutorial/files/ktutorial-0.5/README/view" title="KTutorial 0.5 release notes">release notes</a>, which list the changes from the previous release.</p> + <p>Current release is 0.5.1. You can download <a href="http://sourceforge.net/projects/ktutorial/files/ktutorial-0.5.1/ktutorial-0.5.1.tar.gz/download" title="KTutorial 0.5.1 release in tar.gz">ktutorial-0.5.1.tar.gz</a> from <a href="http://sourceforge.net/projects/ktutorial/files/" title="KTutorial project files">project's file list</a>.</p> + <p>You can also see the <a href="http://sourceforge.net/projects/ktutorial/files/ktutorial-0.5.1/README/view" title="KTutorial 0.5.1 release notes">release notes</a>, which list the changes from the previous release.</p> <p>See below for build instructions, in <a href="#build" title="Build instructions">building section</a>.</p> <p>If you do know what you are doing ;) , you can also checkout KTutorial sources from <acronym title="Subversion">SVN</acronym> repository. Go on reading to know how to do it.</p> @@ -39,8 +39,9 @@ <p>In order to build KTutorial, it doesn't matter if you downloaded it from a release or from <acronym title="Subversion">SVN</acronym>.</p> <p>You will need <a href="http://www.cmake.org" title="CMake project web">CMake</a>, and Qt >= 4.6 and KDE 4 kdelibs development packages installed in your system. It can be built like any other KDE 4 library or application.</p> <p>Create a <em>build</em> subdirectory in <em>ktutorial</em> directory, and change to it. Now, in a terminal, just run <strong>cmake ../ && make</strong> and it will configure and build KTutorial in the <em>build</em> directory. Once built, execute <strong>make install</strong> and you are done (you will likely need to change to root user, as default KDE installation is usually only root writable).</p> - <p>If you want to specify a prefix to install KTutorial to, instead of using KDE default installation directory, call CMake using the parameter <strong>-DCMAKE_INSTALL_PREFIX=/installation/prefix</strong>. For debugging purposes, use <strong>-DCMAKE_BUILD_TYPE=debugfull</strong>. To automatically build the unit tests when the project is built, use <strong>-DKDE4_BUILD_TESTS=ON</strong>.</p> + <p>If you want to specify a prefix to install KTutorial to, instead of using KDE default installation directory, call CMake using the parameter <strong>-DCMAKE_INSTALL_PREFIX=/installation/prefix</strong>. For debugging purposes, use <strong>-DCMAKE_BUILD_TYPE=debugfull</strong>. If you want to prevent some directory to be built (for example, the one for the test application), use <strong>BUILD_ktutorial-test-app=NO</strong>. To automatically build the unit tests when the project is built, use <strong>-DKDE4_BUILD_TESTS=ON</strong>.</p> + <p>If you intend to run the unit tests you may find this little trick valuable: <a href="http://ktutorial.wordpress.com/2012/12/06/preventing-graphical-automated-tests-from-interrupting-you/" title="Preventing graphical automated tests from interrupting you article in KTutorial project blog">Preventing graphical automated tests from interrupting you</a>.</p> - <p class="lastUpdated">Last updated: 2012-08-21</p> + <p class="lastUpdated">Last updated: 2012-12-06</p> </page:content> </page> Modified: trunk/web-src/pages/index.xml =================================================================== --- trunk/web-src/pages/index.xml 2012-09-04 22:38:45 UTC (rev 388) +++ trunk/web-src/pages/index.xml 2012-12-07 10:43:32 UTC (rev 389) @@ -26,6 +26,22 @@ <div id="news"> <div class="new"> <h2 class="newTitle"> + <a id="newId8" class="anchorLink">KTutorial 0.5.1 released!</a> + </h2> + <div class="newBody"> + <p class="newDate">2012-12-06</p> + <div class="newContent"> + <div> + <p>This is the first release licensed under the GPLv2+, and the first one containing translations provided by the KDE localization teams (thank you for your work! :) ).</p> + <p>The <a href="http://sourceforge.net/projects/ktutorial/files/ktutorial-0.5.1/README/view" title="KTutorial 0.5.1 release notes">release notes</a> contain more information about the changes from 0.5 release.</p> + <p>Check the <a href="download.html" title="Download page in KTutorial web">download page</a> for information about downloading and building KTutorial.</p> + <p>And yes, I know, I have a very loose concept of "soon" :P</p> + </div> + </div> + </div> + </div> + <div class="new"> + <h2 class="newTitle"> <a id="newId7" class="anchorLink">License changed from GPLv3+ to GPLv2+</a> </h2> <div class="newBody"> Modified: trunk/web-src/pages/news.xml =================================================================== --- trunk/web-src/pages/news.xml 2012-09-04 22:38:45 UTC (rev 388) +++ trunk/web-src/pages/news.xml 2012-12-07 10:43:32 UTC (rev 389) @@ -23,6 +23,22 @@ <div id="news"> <div class="new"> <h2 class="newTitle"> + <a id="newId8" class="anchorLink">KTutorial 0.5.1 released!</a> + </h2> + <div class="newBody"> + <p class="newDate">2012-12-06</p> + <div class="newContent"> + <div> + <p>This is the first release licensed under the GPLv2+, and the first one containing translations provided by the KDE localization teams (thank you for your work! :) ).</p> + <p>The <a href="http://sourceforge.net/projects/ktutorial/files/ktutorial-0.5.1/README/view" title="KTutorial 0.5.1 release notes">release notes</a> contain more information about the changes from 0.5 release.</p> + <p>Check the <a href="download.html" title="Download page in KTutorial web">download page</a> for information about downloading and building KTutorial.</p> + <p>And yes, I know, I have a very loose concept of "soon" :P</p> + </div> + </div> + </div> + </div> + <div class="new"> + <h2 class="newTitle"> <a id="newId7" class="anchorLink">License changed from GPLv3+ to GPLv2+</a> </h2> <div class="newBody"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-09-04 22:38:51
|
Revision: 388 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=388&view=rev Author: danxuliu Date: 2012-09-04 22:38:45 +0000 (Tue, 04 Sep 2012) Log Message: ----------- Update web page to reflect the license change from GPLv3+ to GPLv2+. Two of the example tutorials where also licensed under the GPLv2+ (the third one was a derivated work, so I couldn't change its license). Modified Paths: -------------- trunk/web-src/data/files/examples/gwenview-fullScreenInterface.xml trunk/web-src/data/files/examples/gwenview.patch trunk/web-src/data/files/examples/kdenlive-simpleSlideTransitionBetweenTwoClips.xml trunk/web-src/data/files/examples/kdenlive.patch trunk/web-src/newsList.xml trunk/web-src/pages/about.xml trunk/web-src/pages/index.xml trunk/web-src/pages/news.xml Modified: trunk/web-src/data/files/examples/gwenview-fullScreenInterface.xml =================================================================== --- trunk/web-src/data/files/examples/gwenview-fullScreenInterface.xml 2012-09-04 21:48:04 UTC (rev 387) +++ trunk/web-src/data/files/examples/gwenview-fullScreenInterface.xml 2012-09-04 22:38:45 UTC (rev 388) @@ -1,6 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> <tutorial name="Full screen interface"> <description>An overview of the full screen interface of Gwenview.</description> + <license>Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; If not, see <http://www.gnu.org/licenses/>.</license> <step id="start"> <text><para>Gwenview features two modes: browse and view. In versions prior to 2.9 only the view mode had also a full screen interface. In Gwenview 2.9 a full screen interface was added for the browse mode too.</para> Modified: trunk/web-src/data/files/examples/gwenview.patch =================================================================== --- trunk/web-src/data/files/examples/gwenview.patch 2012-09-04 21:48:04 UTC (rev 387) +++ trunk/web-src/data/files/examples/gwenview.patch 2012-09-04 22:38:45 UTC (rev 388) @@ -110,10 +110,27 @@ +install(FILES fullScreenInterface.js DESTINATION ${DATA_INSTALL_DIR}/gwenview/tutorials/) diff --git a/tutorials/fullScreenInterface.js b/tutorials/fullScreenInterface.js new file mode 100644 -index 0000000..0c4153d +index 0000000..92665f0 --- /dev/null +++ b/tutorials/fullScreenInterface.js -@@ -0,0 +1,191 @@ +@@ -0,0 +1,208 @@ ++/**************************************************************************** ++ * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * ++ * * ++ * This program is free software; you can redistribute it and/or modify * ++ * it under the terms of the GNU General Public License as published by * ++ * the Free Software Foundation; either version 2 of the License, or * ++ * (at your option) any later version. * ++ * * ++ * This program is distributed in the hope that it will be useful, * ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of * ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * ++ * GNU General Public License for more details. * ++ * * ++ * You should have received a copy of the GNU General Public License * ++ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ++ ****************************************************************************/ ++ +t = Kross.module("kdetranslation"); + +tutorial.tutorialInformationAsObject().setName(t.i18n("Full screen interface")); Modified: trunk/web-src/data/files/examples/kdenlive-simpleSlideTransitionBetweenTwoClips.xml =================================================================== --- trunk/web-src/data/files/examples/kdenlive-simpleSlideTransitionBetweenTwoClips.xml 2012-09-04 21:48:04 UTC (rev 387) +++ trunk/web-src/data/files/examples/kdenlive-simpleSlideTransitionBetweenTwoClips.xml 2012-09-04 22:38:45 UTC (rev 388) @@ -3,7 +3,18 @@ <description>Basic usage of "slide" transition.</description> <license>Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> -This tutorial is licensed under the Creative Commons Attribution-ShareAlike License (http://creativecommons.org/licenses/by-sa/3.0/).</license> +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; If not, see <http://www.gnu.org/licenses/>.</license> <step id="start"> <text><para>In this tutorial you will learn how to add a <emphasis>slide</emphasis> transition between two clips and how to do some basic changes in the transition.</para> Modified: trunk/web-src/data/files/examples/kdenlive.patch =================================================================== --- trunk/web-src/data/files/examples/kdenlive.patch 2012-09-04 21:48:04 UTC (rev 387) +++ trunk/web-src/data/files/examples/kdenlive.patch 2012-09-04 22:38:45 UTC (rev 388) @@ -21,15 +21,26 @@ +install(FILES simpleSlideTransitionBetweenTwoClips.js DESTINATION ${DATA_INSTALL_DIR}/kdenlive/tutorials) diff --git a/data/simpleSlideTransitionBetweenTwoClips.js b/data/simpleSlideTransitionBetweenTwoClips.js new file mode 100644 -index 0000000..375f877 +index 0000000..a05a9cf --- /dev/null +++ b/data/simpleSlideTransitionBetweenTwoClips.js -@@ -0,0 +1,310 @@ -+/********************************************************************************************************************************************* -+ * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * -+ * * -+ * This tutorial is licensed under the Creative Commons Attribution-ShareAlike License (http://creativecommons.org/licenses/by-sa/3.0/). * -+ *********************************************************************************************************************************************/ +@@ -0,0 +1,321 @@ ++/**************************************************************************** ++ * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * ++ * * ++ * This program is free software; you can redistribute it and/or modify * ++ * it under the terms of the GNU General Public License as published by * ++ * the Free Software Foundation; either version 2 of the License, or * ++ * (at your option) any later version. * ++ * * ++ * This program is distributed in the hope that it will be useful, * ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of * ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * ++ * GNU General Public License for more details. * ++ * * ++ * You should have received a copy of the GNU General Public License * ++ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ++ ****************************************************************************/ + +t = Kross.module("kdetranslation"); + Modified: trunk/web-src/newsList.xml =================================================================== --- trunk/web-src/newsList.xml 2012-09-04 21:48:04 UTC (rev 387) +++ trunk/web-src/newsList.xml 2012-09-04 22:38:45 UTC (rev 388) @@ -79,4 +79,17 @@ <date>2012-08-30</date> </fullDate> </new> + + <new> + <title>License changed from GPLv3+ to GPLv2+</title> + <summary> + <div xmlns="http://www.w3.org/1999/xhtml"> + <p>I have changed the KTutorial license from GPLv3+ to GPLv2+ to ensure that any KDE application can use KTutorial (with the previous license it could be used only in applications that did not link against any GPLv2 only libraries) and to be able to move the code to KDE repositories.</p> + <p>I will release a new KTutorial version featuring the new license soon.</p> + </div> + </summary> + <fullDate> + <date>2012-09-04</date> + </fullDate> + </new> </news> Modified: trunk/web-src/pages/about.xml =================================================================== --- trunk/web-src/pages/about.xml 2012-09-04 21:48:04 UTC (rev 387) +++ trunk/web-src/pages/about.xml 2012-09-04 22:38:45 UTC (rev 388) @@ -18,7 +18,7 @@ <h2><a id="project" class="anchorLink">Project overview</a></h2> </div> <p>KTutorial is a library (and a graphical editor) for interactive tutorials in KDE applications. Tutorials are embeded in the application itself, and react to user actions: wait for some task to be accomplished, warn if something wasn't done as it should, etcetera. As the tutorial is being followed, the system gives feedback to the user.</p> - <p>It is licensed under the <a href="http://www.gnu.org/copyleft/gpl.html" title="GNU General Public License page">GNU GPL license</a>. It is also free as in "free beer".</p> + <p>It is licensed under the <a href="http://www.gnu.org/copyleft/gpl.html" title="GNU General Public License page">GNU GPL version 2 or later</a>. It is also free as in "free beer".</p> <div class="h2Rounded"> <h2><a id="author" class="anchorLink">Author</a></h2> @@ -34,6 +34,6 @@ <p>The web is divided in several sections that can be accessed through the links in the menu in each page. I'm not going to explain its structure, as it seems very clear and I have better things to spend my time on :P</p> <p>You can find information about how this web is built in its own page: <a href="aboutWeb.html" title="About KTutorial project web building">About web</a>.</p> - <p class="lastUpdated">Last updated: 2012-08-21</p> + <p class="lastUpdated">Last updated: 2012-09-04</p> </page:content> </page> Modified: trunk/web-src/pages/index.xml =================================================================== --- trunk/web-src/pages/index.xml 2012-09-04 21:48:04 UTC (rev 387) +++ trunk/web-src/pages/index.xml 2012-09-04 22:38:45 UTC (rev 388) @@ -16,7 +16,7 @@ <page:content xmlns:page="http://lusi.berlios.de/namespaces/page" xmlns="http://www.w3.org/1999/xhtml"> <h1>Main</h1> <p>KTutorial is a library for interactive tutorials in KDE applications. Tutorials are embeded in the application itself, and reacts to user actions: waits for some task to be accomplished, warns if something wasn't done as it should, etcetera. As the tutorial is being followed, the system gives feedback to the user.</p> - <p>It is licensed under the <a href="http://www.gnu.org/copyleft/gpl.html" title="GNU General Public License page">GNU GPL license</a>. It is also free as in "free beer".</p> + <p>It is licensed under the <a href="http://www.gnu.org/copyleft/gpl.html" title="GNU General Public License page">GNU GPL version 2 or later</a>. It is also free as in "free beer".</p> <h1>News</h1> <p id="rssFeed"> <a href="feed/atom/news.xml" type="application/atom+xml" title="Atom feed"> @@ -26,6 +26,20 @@ <div id="news"> <div class="new"> <h2 class="newTitle"> + <a id="newId7" class="anchorLink">License changed from GPLv3+ to GPLv2+</a> + </h2> + <div class="newBody"> + <p class="newDate">2012-09-04</p> + <div class="newContent"> + <div> + <p>I have changed the KTutorial license from GPLv3+ to GPLv2+ to ensure that any KDE application can use KTutorial (with the previous license it could be used only in applications that did not link against any GPLv2 only libraries) and to be able to move the code to KDE repositories.</p> + <p>I will release a new KTutorial version featuring the new license soon.</p> + </div> + </div> + </div> + </div> + <div class="new"> + <h2 class="newTitle"> <a id="newId6" class="anchorLink">Examples of KTutorial for the real world</a> </h2> <div class="newBody"> Modified: trunk/web-src/pages/news.xml =================================================================== --- trunk/web-src/pages/news.xml 2012-09-04 21:48:04 UTC (rev 387) +++ trunk/web-src/pages/news.xml 2012-09-04 22:38:45 UTC (rev 388) @@ -23,6 +23,20 @@ <div id="news"> <div class="new"> <h2 class="newTitle"> + <a id="newId7" class="anchorLink">License changed from GPLv3+ to GPLv2+</a> + </h2> + <div class="newBody"> + <p class="newDate">2012-09-04</p> + <div class="newContent"> + <div> + <p>I have changed the KTutorial license from GPLv3+ to GPLv2+ to ensure that any KDE application can use KTutorial (with the previous license it could be used only in applications that did not link against any GPLv2 only libraries) and to be able to move the code to KDE repositories.</p> + <p>I will release a new KTutorial version featuring the new license soon.</p> + </div> + </div> + </div> + </div> + <div class="new"> + <h2 class="newTitle"> <a id="newId6" class="anchorLink">Examples of KTutorial for the real world</a> </h2> <div class="newBody"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-09-04 21:48:10
|
Revision: 387 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=387&view=rev Author: danxuliu Date: 2012-09-04 21:48:04 +0000 (Tue, 04 Sep 2012) Log Message: ----------- Add missing license information. Modified Paths: -------------- trunk/ktutorial/ktutorial-editor/src/tutorials/BasicConcepts.js trunk/ktutorial/ktutorial-editor/src/tutorials/BasicConcepts.xml trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.js trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.xml Modified: trunk/ktutorial/ktutorial-editor/src/tutorials/BasicConcepts.js =================================================================== --- trunk/ktutorial/ktutorial-editor/src/tutorials/BasicConcepts.js 2012-09-04 16:47:15 UTC (rev 386) +++ trunk/ktutorial/ktutorial-editor/src/tutorials/BasicConcepts.js 2012-09-04 21:48:04 UTC (rev 387) @@ -1,3 +1,21 @@ +/**************************************************************************** + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; If not, see <http://www.gnu.org/licenses/>. * + ****************************************************************************/ + t = Kross.module("kdetranslation"); tutorial.tutorialInformationAsObject().setName(t.i18n("Basic concepts")); Modified: trunk/ktutorial/ktutorial-editor/src/tutorials/BasicConcepts.xml =================================================================== --- trunk/ktutorial/ktutorial-editor/src/tutorials/BasicConcepts.xml 2012-09-04 16:47:15 UTC (rev 386) +++ trunk/ktutorial/ktutorial-editor/src/tutorials/BasicConcepts.xml 2012-09-04 21:48:04 UTC (rev 387) @@ -1,6 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> <tutorial name="Basic concepts"> <description>This tutorial shows how to design a basic tutorial for the KTutorial test application.</description> + <license>Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> +Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; If not, see <http://www.gnu.org/licenses/>.</license> <step id="start"> <text><para>Welcome to the tutorial to learn the basic concepts in <application>KTutorial editor</application>.</para> Modified: trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.js =================================================================== --- trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.js 2012-09-04 16:47:15 UTC (rev 386) +++ trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.js 2012-09-04 21:48:04 UTC (rev 387) @@ -1,3 +1,21 @@ +/**************************************************************************** + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; If not, see <http://www.gnu.org/licenses/>. * + ****************************************************************************/ + t = Kross.module("kdetranslation"); tutorial.tutorialInformationAsObject().setName(t.i18n("Interacting with the target application")); Modified: trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.xml =================================================================== --- trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.xml 2012-09-04 16:47:15 UTC (rev 386) +++ trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.xml 2012-09-04 21:48:04 UTC (rev 387) @@ -1,6 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> <tutorial name="Interacting with the target application"> <description>This tutorial shows how KTutorial editor can interact with the target application of a tutorial, for example, to show the object names or test the tutorial without installing it.</description> + <license>Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> +Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; If not, see <http://www.gnu.org/licenses/>.</license> <step id="start"> <text><para>Welcome to the tutorial to learn how <application>KTutorial editor</application> can interact with the target application.</para> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-09-04 16:47:29
|
Revision: 386 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=386&view=rev Author: danxuliu Date: 2012-09-04 16:47:15 +0000 (Tue, 04 Sep 2012) Log Message: ----------- Fix copyright years based on SVN logs, as, according to GNU project page, using ranges is fine only when all the years in the range are "copyrightable" years and this usage is explicitly stated in the documentation. Modified Paths: -------------- trunk/ktutorial/ktutorial-editor/src/EditActions.cpp trunk/ktutorial/ktutorial-editor/src/EditActions.h trunk/ktutorial/ktutorial-editor/src/FileActions.cpp trunk/ktutorial/ktutorial-editor/src/FileActions.h trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.h trunk/ktutorial/ktutorial-editor/src/TestTutorialActions.cpp trunk/ktutorial/ktutorial-editor/src/TestTutorialActions.h trunk/ktutorial/ktutorial-editor/src/TutorialTester.cpp trunk/ktutorial/ktutorial-editor/src/TutorialTester.h trunk/ktutorial/ktutorial-editor/src/commands/ReactionCommands.cpp trunk/ktutorial/ktutorial-editor/src/commands/ReactionCommands.h trunk/ktutorial/ktutorial-editor/src/commands/StepCommands.cpp trunk/ktutorial/ktutorial-editor/src/commands/StepCommands.h trunk/ktutorial/ktutorial-editor/src/commands/TutorialCommands.cpp trunk/ktutorial/ktutorial-editor/src/commands/TutorialCommands.h trunk/ktutorial/ktutorial-editor/src/data/Reaction.cpp trunk/ktutorial/ktutorial-editor/src/data/Reaction.h trunk/ktutorial/ktutorial-editor/src/data/Step.cpp trunk/ktutorial/ktutorial-editor/src/data/Step.h trunk/ktutorial/ktutorial-editor/src/data/Tutorial.cpp trunk/ktutorial/ktutorial-editor/src/data/Tutorial.h trunk/ktutorial/ktutorial-editor/src/data/WaitFor.cpp trunk/ktutorial/ktutorial-editor/src/data/WaitFor.h trunk/ktutorial/ktutorial-editor/src/data/WaitForComposed.cpp trunk/ktutorial/ktutorial-editor/src/data/WaitForComposed.h trunk/ktutorial/ktutorial-editor/src/data/WaitForEvent.cpp trunk/ktutorial/ktutorial-editor/src/data/WaitForEvent.h trunk/ktutorial/ktutorial-editor/src/data/WaitForNot.cpp trunk/ktutorial/ktutorial-editor/src/data/WaitForNot.h trunk/ktutorial/ktutorial-editor/src/data/WaitForProperty.cpp trunk/ktutorial/ktutorial-editor/src/data/WaitForProperty.h trunk/ktutorial/ktutorial-editor/src/data/WaitForSignal.cpp trunk/ktutorial/ktutorial-editor/src/data/WaitForSignal.h trunk/ktutorial/ktutorial-editor/src/data/WaitForStepActivation.cpp trunk/ktutorial/ktutorial-editor/src/data/WaitForStepActivation.h trunk/ktutorial/ktutorial-editor/src/data/WaitForWindow.cpp trunk/ktutorial/ktutorial-editor/src/data/WaitForWindow.h trunk/ktutorial/ktutorial-editor/src/main.cpp trunk/ktutorial/ktutorial-editor/src/serialization/DeserializationException.cpp trunk/ktutorial/ktutorial-editor/src/serialization/DeserializationException.h trunk/ktutorial/ktutorial-editor/src/serialization/IOException.cpp trunk/ktutorial/ktutorial-editor/src/serialization/IOException.h trunk/ktutorial/ktutorial-editor/src/serialization/JavascriptExporter.cpp trunk/ktutorial/ktutorial-editor/src/serialization/JavascriptExporter.h trunk/ktutorial/ktutorial-editor/src/serialization/Serialization.cpp trunk/ktutorial/ktutorial-editor/src/serialization/Serialization.h trunk/ktutorial/ktutorial-editor/src/serialization/TutorialReader.cpp trunk/ktutorial/ktutorial-editor/src/serialization/TutorialReader.h trunk/ktutorial/ktutorial-editor/src/serialization/TutorialWriter.cpp trunk/ktutorial/ktutorial-editor/src/serialization/TutorialWriter.h trunk/ktutorial/ktutorial-editor/src/targetapplication/DBusException.cpp trunk/ktutorial/ktutorial-editor/src/targetapplication/DBusException.h trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteClass.cpp trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteClass.h trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteEditorSupport.cpp trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteEditorSupport.h trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteEventSpy.cpp trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteEventSpy.h trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteObject.cpp trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteObject.h trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteObjectMapper.cpp trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteObjectMapper.h trunk/ktutorial/ktutorial-editor/src/targetapplication/TargetApplication.cpp trunk/ktutorial/ktutorial-editor/src/targetapplication/TargetApplication.h trunk/ktutorial/ktutorial-editor/src/util/Exception.cpp trunk/ktutorial/ktutorial-editor/src/util/Exception.h trunk/ktutorial/ktutorial-editor/src/view/ActionListWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/ActionListWidget.h trunk/ktutorial/ktutorial-editor/src/view/AutoExpandableTreeView.cpp trunk/ktutorial/ktutorial-editor/src/view/AutoExpandableTreeView.h trunk/ktutorial/ktutorial-editor/src/view/CommandWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/CommandWidget.h trunk/ktutorial/ktutorial-editor/src/view/DialogRunner.cpp trunk/ktutorial/ktutorial-editor/src/view/DialogRunner.h trunk/ktutorial/ktutorial-editor/src/view/EditionDialog.cpp trunk/ktutorial/ktutorial-editor/src/view/EditionDialog.h trunk/ktutorial/ktutorial-editor/src/view/EditionWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/EditionWidget.h trunk/ktutorial/ktutorial-editor/src/view/LicenseWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/LicenseWidget.h trunk/ktutorial/ktutorial-editor/src/view/NewWaitForWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/NewWaitForWidget.h trunk/ktutorial/ktutorial-editor/src/view/ReactionTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/ReactionTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/ReactionWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/ReactionWidget.h trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectChooser.cpp trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectChooser.h trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectChooserFilterModel.cpp trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectChooserFilterModel.h trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectNameRegister.cpp trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectNameRegister.h trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectNameWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectNameWidget.h trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeItemUpdater.cpp trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeItemUpdater.h trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeSelectionManager.cpp trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeSelectionManager.h trunk/ktutorial/ktutorial-editor/src/view/SemanticMarkupEdition.cpp trunk/ktutorial/ktutorial-editor/src/view/SemanticMarkupEdition.h trunk/ktutorial/ktutorial-editor/src/view/SemanticMarkupLinkWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/SemanticMarkupLinkWidget.h trunk/ktutorial/ktutorial-editor/src/view/SemanticMarkupParser.cpp trunk/ktutorial/ktutorial-editor/src/view/SemanticMarkupParser.h trunk/ktutorial/ktutorial-editor/src/view/StepCustomCodeWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/StepCustomCodeWidget.h trunk/ktutorial/ktutorial-editor/src/view/StepDataWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/StepDataWidget.h trunk/ktutorial/ktutorial-editor/src/view/StepTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/StepTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/TargetApplicationView.cpp trunk/ktutorial/ktutorial-editor/src/view/TargetApplicationView.h trunk/ktutorial/ktutorial-editor/src/view/TextTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/TextTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/TreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/TreeItem.h trunk/ktutorial/ktutorial-editor/src/view/TreeItemUtil.cpp trunk/ktutorial/ktutorial-editor/src/view/TreeItemUtil.h trunk/ktutorial/ktutorial-editor/src/view/TreeModel.cpp trunk/ktutorial/ktutorial-editor/src/view/TreeModel.h trunk/ktutorial/ktutorial-editor/src/view/TutorialCustomCodeWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/TutorialCustomCodeWidget.h trunk/ktutorial/ktutorial-editor/src/view/TutorialInformationWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/TutorialInformationWidget.h trunk/ktutorial/ktutorial-editor/src/view/TutorialTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/TutorialTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/TutorialTreeSelectionManager.cpp trunk/ktutorial/ktutorial-editor/src/view/TutorialTreeSelectionManager.h trunk/ktutorial/ktutorial-editor/src/view/WaitForComposedTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForComposedTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/WaitForEventTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForEventTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/WaitForEventWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForEventWidget.h trunk/ktutorial/ktutorial-editor/src/view/WaitForNotTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForNotTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/WaitForPropertyTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForPropertyTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/WaitForPropertyWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForPropertyWidget.h trunk/ktutorial/ktutorial-editor/src/view/WaitForSignalTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForSignalTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/WaitForSignalWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForSignalWidget.h trunk/ktutorial/ktutorial-editor/src/view/WaitForStepActivationTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForStepActivationTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/WaitForTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/WaitForWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForWidget.h trunk/ktutorial/ktutorial-editor/src/view/WaitForWindowTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForWindowTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/WaitForWindowWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForWindowWidget.h trunk/ktutorial/ktutorial-editor/tests/unit/commands/ReactionCommandsTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/commands/StepCommandsTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/commands/TutorialCommandsTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/ReactionTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/StepTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/TutorialTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/WaitForComposedTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/WaitForEventTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/WaitForNotTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/WaitForPropertyTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/WaitForSignalTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/WaitForStepActivationTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/WaitForTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/WaitForWindowTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/serialization/DeserializationExceptionTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/serialization/IOExceptionTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/serialization/JavascriptExporterTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/serialization/SerializationTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/serialization/TutorialReaderTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/serialization/TutorialWriterTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/DBusExceptionTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/DummyApplication.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/RemoteClassStubs.h trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/RemoteClassTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/RemoteEditorSupportTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/RemoteEventSpyTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/RemoteObjectMapperTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/RemoteObjectTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/TargetApplicationStub.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/TargetApplicationStubWithDelayedRegister.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/TargetApplicationTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/util/ExceptionTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/ActionListWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/AutoExpandableTreeViewTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/CommandWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/DialogRunnerTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/EditionDialogTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/LicenseWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/NewWaitForWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/ReactionTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/ReactionWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectChooserFilterModelTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectChooserTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectNameRegisterTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectNameWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectTreeItemUpdaterTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectTreeSelectionManagerTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/SemanticMarkupEditionTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/SemanticMarkupLinkWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/SemanticMarkupParserTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/StepCustomCodeWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/StepDataWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/StepTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/TextTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/TreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/TreeItemUtilTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/TreeModelTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/TutorialCustomCodeWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/TutorialInformationWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/TutorialTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/TutorialTreeSelectionManagerTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForComposedTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForEventTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForEventWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForNotTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForPropertyTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForPropertyWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForSignalTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForSignalWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForStepActivationTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForWindowTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForWindowWidgetTest.cpp trunk/ktutorial/ktutorial-library/cmake/modules/FindKTutorial.cmake trunk/ktutorial/ktutorial-library/src/KTutorial.cpp trunk/ktutorial/ktutorial-library/src/KTutorial.h trunk/ktutorial/ktutorial-library/src/KTutorialCustomization.cpp trunk/ktutorial/ktutorial-library/src/KTutorialCustomization.h trunk/ktutorial/ktutorial-library/src/ObjectFinder.cpp trunk/ktutorial/ktutorial-library/src/ObjectFinder.h trunk/ktutorial/ktutorial-library/src/Option.cpp trunk/ktutorial/ktutorial-library/src/Option.h trunk/ktutorial/ktutorial-library/src/Step.cpp trunk/ktutorial/ktutorial-library/src/Step.h trunk/ktutorial/ktutorial-library/src/Tutorial.cpp trunk/ktutorial/ktutorial-library/src/Tutorial.h trunk/ktutorial/ktutorial-library/src/TutorialInformation.cpp trunk/ktutorial/ktutorial-library/src/TutorialInformation.h trunk/ktutorial/ktutorial-library/src/TutorialManager.cpp trunk/ktutorial/ktutorial-library/src/TutorialManager.h trunk/ktutorial/ktutorial-library/src/WaitFor.cpp trunk/ktutorial/ktutorial-library/src/WaitFor.h trunk/ktutorial/ktutorial-library/src/WaitForAnd.cpp trunk/ktutorial/ktutorial-library/src/WaitForAnd.h trunk/ktutorial/ktutorial-library/src/WaitForComposed.cpp trunk/ktutorial/ktutorial-library/src/WaitForComposed.h trunk/ktutorial/ktutorial-library/src/WaitForEvent.cpp trunk/ktutorial/ktutorial-library/src/WaitForEvent.h trunk/ktutorial/ktutorial-library/src/WaitForNot.cpp trunk/ktutorial/ktutorial-library/src/WaitForNot.h trunk/ktutorial/ktutorial-library/src/WaitForOr.cpp trunk/ktutorial/ktutorial-library/src/WaitForOr.h trunk/ktutorial/ktutorial-library/src/WaitForProperty.cpp trunk/ktutorial/ktutorial-library/src/WaitForProperty.h trunk/ktutorial/ktutorial-library/src/WaitForSignal.cpp trunk/ktutorial/ktutorial-library/src/WaitForSignal.h trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.cpp trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.h trunk/ktutorial/ktutorial-library/src/WaitForWindow.cpp trunk/ktutorial/ktutorial-library/src/WaitForWindow.h trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.cpp trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.h trunk/ktutorial/ktutorial-library/src/customization/DefaultKdeCustomization.cpp trunk/ktutorial/ktutorial-library/src/customization/DefaultKdeCustomization.h trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.h trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.h trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.h trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.h trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.h trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.h trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.h trunk/ktutorial/ktutorial-library/src/extendedinformation/WidgetHighlighter.cpp trunk/ktutorial/ktutorial-library/src/extendedinformation/WidgetHighlighter.h trunk/ktutorial/ktutorial-library/src/extendedinformation/WidgetHighlighterManager.cpp trunk/ktutorial/ktutorial-library/src/extendedinformation/WidgetHighlighterManager.h trunk/ktutorial/ktutorial-library/src/ktutorial_export.h trunk/ktutorial/ktutorial-library/src/scripting/ScriptManager.cpp trunk/ktutorial/ktutorial-library/src/scripting/ScriptManager.h trunk/ktutorial/ktutorial-library/src/scripting/ScriptedStep.cpp trunk/ktutorial/ktutorial-library/src/scripting/ScriptedStep.h trunk/ktutorial/ktutorial-library/src/scripting/ScriptedTutorial.cpp trunk/ktutorial/ktutorial-library/src/scripting/ScriptedTutorial.h trunk/ktutorial/ktutorial-library/src/scripting/ScriptingModule.cpp trunk/ktutorial/ktutorial-library/src/scripting/ScriptingModule.h trunk/ktutorial/ktutorial-library/src/tutorials/UsingKTutorial.cpp trunk/ktutorial/ktutorial-library/src/tutorials/UsingKTutorial.h trunk/ktutorial/ktutorial-library/src/version.h.cmake trunk/ktutorial/ktutorial-library/src/view/StepTextWidget.cpp trunk/ktutorial/ktutorial-library/src/view/StepTextWidget.h trunk/ktutorial/ktutorial-library/src/view/StepWidget.cpp trunk/ktutorial/ktutorial-library/src/view/StepWidget.h trunk/ktutorial/ktutorial-library/src/view/TutorialListModel.cpp trunk/ktutorial/ktutorial-library/src/view/TutorialListModel.h trunk/ktutorial/ktutorial-library/src/view/TutorialManagerDialog.cpp trunk/ktutorial/ktutorial-library/src/view/TutorialManagerDialog.h trunk/ktutorial/ktutorial-library/src/view/WindowOnTopEnforcer.cpp trunk/ktutorial/ktutorial-library/src/view/WindowOnTopEnforcer.h trunk/ktutorial/ktutorial-library/tests/ObjectFinderTest.cpp trunk/ktutorial/ktutorial-library/tests/OptionTest.cpp trunk/ktutorial/ktutorial-library/tests/StepTest.cpp trunk/ktutorial/ktutorial-library/tests/TutorialInformationTest.cpp trunk/ktutorial/ktutorial-library/tests/TutorialManagerTest.cpp trunk/ktutorial/ktutorial-library/tests/TutorialTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForAndTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForComposedTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForEventTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForNotTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForOrTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForPropertyTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForSignalTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForStepActivationTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForWindowTest.cpp trunk/ktutorial/ktutorial-library/tests/common/WindowVisibilitySpyTest.cpp trunk/ktutorial/ktutorial-library/tests/customization/DefaultKdeCustomizationTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/ClassRegisterAdaptorTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/EditorSupportAdaptorTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/EditorSupportTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/EventSpyAdaptorTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/EventSpyTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/ObjectRegisterAdaptorTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/ObjectRegisterTest.cpp trunk/ktutorial/ktutorial-library/tests/extendedinformation/WidgetHighlighterManagerTest.cpp trunk/ktutorial/ktutorial-library/tests/extendedinformation/WidgetHighlighterTest.cpp trunk/ktutorial/ktutorial-library/tests/scripting/ScriptManagerTest.cpp trunk/ktutorial/ktutorial-library/tests/scripting/ScriptedStepTest.cpp trunk/ktutorial/ktutorial-library/tests/scripting/ScriptedTutorialTest.cpp trunk/ktutorial/ktutorial-library/tests/scripting/ScriptingModuleTest.cpp trunk/ktutorial/ktutorial-library/tests/scripting/ScriptingTest.cpp trunk/ktutorial/ktutorial-library/tests/view/StepTextWidgetTest.cpp trunk/ktutorial/ktutorial-library/tests/view/StepWidgetTest.cpp trunk/ktutorial/ktutorial-library/tests/view/TutorialListModelTest.cpp trunk/ktutorial/ktutorial-library/tests/view/TutorialManagerDialogTest.cpp trunk/ktutorial/ktutorial-library/tests/view/WindowOnTopEnforcerTest.cpp trunk/ktutorial/ktutorial-test-app/TutorialClearText.cpp trunk/ktutorial/ktutorial-test-app/TutorialClearText.h trunk/ktutorial/ktutorial-test-app/TutorialClearText.js trunk/ktutorial/ktutorial-test-app/TutorialClearText.py trunk/ktutorial/ktutorial-test-app/TutorialMoveText.cpp trunk/ktutorial/ktutorial-test-app/TutorialMoveText.h trunk/ktutorial/ktutorial-test-app/TutorialMoveText.py Modified: trunk/ktutorial/ktutorial-editor/src/EditActions.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/EditActions.cpp 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/EditActions.cpp 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,7 @@ /*************************************************************************** - * Copyright (C) 2010-2011 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2011 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/EditActions.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/EditActions.h 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/EditActions.h 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,7 @@ /*************************************************************************** - * Copyright (C) 2010-2011 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2011 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/FileActions.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/FileActions.cpp 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/FileActions.cpp 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/FileActions.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/FileActions.h 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/FileActions.h 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,7 @@ /*************************************************************************** - * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2011 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.h 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.h 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,7 @@ /*************************************************************************** - * Copyright (C) 2010-2011 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2011 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/TestTutorialActions.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/TestTutorialActions.cpp 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/TestTutorialActions.cpp 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2011 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2011 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/TestTutorialActions.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/TestTutorialActions.h 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/TestTutorialActions.h 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2011 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2011 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/TutorialTester.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/TutorialTester.cpp 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/TutorialTester.cpp 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,7 @@ /*************************************************************************** - * Copyright (C) 2010-2011 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2011 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/TutorialTester.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/TutorialTester.h 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/TutorialTester.h 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,7 @@ /*************************************************************************** - * Copyright (C) 2010-2011 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2011 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/commands/ReactionCommands.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/commands/ReactionCommands.cpp 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/commands/ReactionCommands.cpp 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/commands/ReactionCommands.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/commands/ReactionCommands.h 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/commands/ReactionCommands.h 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/commands/StepCommands.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/commands/StepCommands.cpp 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/commands/StepCommands.cpp 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/commands/StepCommands.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/commands/StepCommands.h 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/commands/StepCommands.h 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/commands/TutorialCommands.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/commands/TutorialCommands.cpp 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/commands/TutorialCommands.cpp 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/commands/TutorialCommands.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/commands/TutorialCommands.h 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/commands/TutorialCommands.h 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/Reaction.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/Reaction.cpp 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/Reaction.cpp 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/Reaction.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/Reaction.h 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/Reaction.h 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/Step.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/Step.cpp 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/Step.cpp 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/Step.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/Step.h 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/Step.h 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/Tutorial.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/Tutorial.cpp 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/Tutorial.cpp 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/Tutorial.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/Tutorial.h 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/Tutorial.h 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitFor.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitFor.cpp 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitFor.cpp 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitFor.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitFor.h 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitFor.h 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForComposed.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForComposed.cpp 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForComposed.cpp 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForComposed.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForComposed.h 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForComposed.h 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForEvent.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForEvent.cpp 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForEvent.cpp 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForEvent.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForEvent.h 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForEvent.h 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForNot.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForNot.cpp 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForNot.cpp 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForNot.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForNot.h 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForNot.h 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForProperty.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForProperty.cpp 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForProperty.cpp 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2011 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2011 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForProperty.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForProperty.h 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForProperty.h 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2011 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2011 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForSignal.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForSignal.cpp 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForSignal.cpp 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForSignal.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForSignal.h 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForSignal.h 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2010 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForStepActivation.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForStepActivation.cpp 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForStepActivation.cpp 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2011 by Daniel Calviño Sánchez * - * dan...@gm... * + * Copyright (C) 2011 by Daniel Calviño Sánchez <dan...@gm...> * + * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForStepActivation.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForStepActivation.h 2012-09-04 14:47:27 UTC (rev 385) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForStepActivation.h 2012-09-04 16:47:15 UTC (rev 386) @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2011 by Daniel Calviño Sánchez * - * dan...@gm... ... [truncated message content] |
From: <dan...@us...> - 2012-09-04 14:47:43
|
Revision: 385 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=385&view=rev Author: danxuliu Date: 2012-09-04 14:47:27 +0000 (Tue, 04 Sep 2012) Log Message: ----------- Change KTutorial license from GPLv3+ to GPLv2+ to ensure compatibility with any KDE application and to be able to move the code to KDE repositories. Modified Paths: -------------- trunk/ktutorial/ktutorial-editor/src/EditActions.cpp trunk/ktutorial/ktutorial-editor/src/EditActions.h trunk/ktutorial/ktutorial-editor/src/FileActions.cpp trunk/ktutorial/ktutorial-editor/src/FileActions.h trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.h trunk/ktutorial/ktutorial-editor/src/TestTutorialActions.cpp trunk/ktutorial/ktutorial-editor/src/TestTutorialActions.h trunk/ktutorial/ktutorial-editor/src/TutorialTester.cpp trunk/ktutorial/ktutorial-editor/src/TutorialTester.h trunk/ktutorial/ktutorial-editor/src/commands/ReactionCommands.cpp trunk/ktutorial/ktutorial-editor/src/commands/ReactionCommands.h trunk/ktutorial/ktutorial-editor/src/commands/StepCommands.cpp trunk/ktutorial/ktutorial-editor/src/commands/StepCommands.h trunk/ktutorial/ktutorial-editor/src/commands/TutorialCommands.cpp trunk/ktutorial/ktutorial-editor/src/commands/TutorialCommands.h trunk/ktutorial/ktutorial-editor/src/data/Reaction.cpp trunk/ktutorial/ktutorial-editor/src/data/Reaction.h trunk/ktutorial/ktutorial-editor/src/data/Step.cpp trunk/ktutorial/ktutorial-editor/src/data/Step.h trunk/ktutorial/ktutorial-editor/src/data/Tutorial.cpp trunk/ktutorial/ktutorial-editor/src/data/Tutorial.h trunk/ktutorial/ktutorial-editor/src/data/WaitFor.cpp trunk/ktutorial/ktutorial-editor/src/data/WaitFor.h trunk/ktutorial/ktutorial-editor/src/data/WaitForComposed.cpp trunk/ktutorial/ktutorial-editor/src/data/WaitForComposed.h trunk/ktutorial/ktutorial-editor/src/data/WaitForEvent.cpp trunk/ktutorial/ktutorial-editor/src/data/WaitForEvent.h trunk/ktutorial/ktutorial-editor/src/data/WaitForNot.cpp trunk/ktutorial/ktutorial-editor/src/data/WaitForNot.h trunk/ktutorial/ktutorial-editor/src/data/WaitForProperty.cpp trunk/ktutorial/ktutorial-editor/src/data/WaitForProperty.h trunk/ktutorial/ktutorial-editor/src/data/WaitForSignal.cpp trunk/ktutorial/ktutorial-editor/src/data/WaitForSignal.h trunk/ktutorial/ktutorial-editor/src/data/WaitForStepActivation.cpp trunk/ktutorial/ktutorial-editor/src/data/WaitForStepActivation.h trunk/ktutorial/ktutorial-editor/src/data/WaitForWindow.cpp trunk/ktutorial/ktutorial-editor/src/data/WaitForWindow.h trunk/ktutorial/ktutorial-editor/src/main.cpp trunk/ktutorial/ktutorial-editor/src/serialization/DeserializationException.cpp trunk/ktutorial/ktutorial-editor/src/serialization/DeserializationException.h trunk/ktutorial/ktutorial-editor/src/serialization/IOException.cpp trunk/ktutorial/ktutorial-editor/src/serialization/IOException.h trunk/ktutorial/ktutorial-editor/src/serialization/JavascriptExporter.cpp trunk/ktutorial/ktutorial-editor/src/serialization/JavascriptExporter.h trunk/ktutorial/ktutorial-editor/src/serialization/Serialization.cpp trunk/ktutorial/ktutorial-editor/src/serialization/Serialization.h trunk/ktutorial/ktutorial-editor/src/serialization/TutorialReader.cpp trunk/ktutorial/ktutorial-editor/src/serialization/TutorialReader.h trunk/ktutorial/ktutorial-editor/src/serialization/TutorialWriter.cpp trunk/ktutorial/ktutorial-editor/src/serialization/TutorialWriter.h trunk/ktutorial/ktutorial-editor/src/targetapplication/DBusException.cpp trunk/ktutorial/ktutorial-editor/src/targetapplication/DBusException.h trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteClass.cpp trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteClass.h trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteEditorSupport.cpp trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteEditorSupport.h trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteEventSpy.cpp trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteEventSpy.h trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteObject.cpp trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteObject.h trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteObjectMapper.cpp trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteObjectMapper.h trunk/ktutorial/ktutorial-editor/src/targetapplication/TargetApplication.cpp trunk/ktutorial/ktutorial-editor/src/targetapplication/TargetApplication.h trunk/ktutorial/ktutorial-editor/src/util/Exception.cpp trunk/ktutorial/ktutorial-editor/src/util/Exception.h trunk/ktutorial/ktutorial-editor/src/view/ActionListWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/ActionListWidget.h trunk/ktutorial/ktutorial-editor/src/view/AutoExpandableTreeView.cpp trunk/ktutorial/ktutorial-editor/src/view/AutoExpandableTreeView.h trunk/ktutorial/ktutorial-editor/src/view/CommandWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/CommandWidget.h trunk/ktutorial/ktutorial-editor/src/view/DialogRunner.cpp trunk/ktutorial/ktutorial-editor/src/view/DialogRunner.h trunk/ktutorial/ktutorial-editor/src/view/EditionDialog.cpp trunk/ktutorial/ktutorial-editor/src/view/EditionDialog.h trunk/ktutorial/ktutorial-editor/src/view/EditionWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/EditionWidget.h trunk/ktutorial/ktutorial-editor/src/view/LicenseWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/LicenseWidget.h trunk/ktutorial/ktutorial-editor/src/view/NewWaitForWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/NewWaitForWidget.h trunk/ktutorial/ktutorial-editor/src/view/ReactionTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/ReactionTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/ReactionWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/ReactionWidget.h trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectChooser.cpp trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectChooser.h trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectChooserFilterModel.cpp trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectChooserFilterModel.h trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectNameRegister.cpp trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectNameRegister.h trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectNameWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectNameWidget.h trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeItemUpdater.cpp trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeItemUpdater.h trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeSelectionManager.cpp trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeSelectionManager.h trunk/ktutorial/ktutorial-editor/src/view/SemanticMarkupEdition.cpp trunk/ktutorial/ktutorial-editor/src/view/SemanticMarkupEdition.h trunk/ktutorial/ktutorial-editor/src/view/SemanticMarkupLinkWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/SemanticMarkupLinkWidget.h trunk/ktutorial/ktutorial-editor/src/view/SemanticMarkupParser.cpp trunk/ktutorial/ktutorial-editor/src/view/SemanticMarkupParser.h trunk/ktutorial/ktutorial-editor/src/view/StepCustomCodeWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/StepCustomCodeWidget.h trunk/ktutorial/ktutorial-editor/src/view/StepDataWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/StepDataWidget.h trunk/ktutorial/ktutorial-editor/src/view/StepTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/StepTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/TargetApplicationView.cpp trunk/ktutorial/ktutorial-editor/src/view/TargetApplicationView.h trunk/ktutorial/ktutorial-editor/src/view/TextTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/TextTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/TreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/TreeItem.h trunk/ktutorial/ktutorial-editor/src/view/TreeItemUtil.cpp trunk/ktutorial/ktutorial-editor/src/view/TreeItemUtil.h trunk/ktutorial/ktutorial-editor/src/view/TreeModel.cpp trunk/ktutorial/ktutorial-editor/src/view/TreeModel.h trunk/ktutorial/ktutorial-editor/src/view/TutorialCustomCodeWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/TutorialCustomCodeWidget.h trunk/ktutorial/ktutorial-editor/src/view/TutorialInformationWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/TutorialInformationWidget.h trunk/ktutorial/ktutorial-editor/src/view/TutorialTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/TutorialTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/TutorialTreeSelectionManager.cpp trunk/ktutorial/ktutorial-editor/src/view/TutorialTreeSelectionManager.h trunk/ktutorial/ktutorial-editor/src/view/WaitForComposedTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForComposedTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/WaitForEventTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForEventTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/WaitForEventWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForEventWidget.h trunk/ktutorial/ktutorial-editor/src/view/WaitForNotTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForNotTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/WaitForPropertyTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForPropertyTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/WaitForPropertyWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForPropertyWidget.h trunk/ktutorial/ktutorial-editor/src/view/WaitForSignalTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForSignalTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/WaitForSignalWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForSignalWidget.h trunk/ktutorial/ktutorial-editor/src/view/WaitForStepActivationTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForStepActivationTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/WaitForTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/WaitForWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForWidget.h trunk/ktutorial/ktutorial-editor/src/view/WaitForWindowTreeItem.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForWindowTreeItem.h trunk/ktutorial/ktutorial-editor/src/view/WaitForWindowWidget.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForWindowWidget.h trunk/ktutorial/ktutorial-editor/tests/unit/commands/ReactionCommandsTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/commands/StepCommandsTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/commands/TutorialCommandsTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/ReactionTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/StepTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/TutorialTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/WaitForComposedTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/WaitForEventTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/WaitForNotTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/WaitForPropertyTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/WaitForSignalTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/WaitForStepActivationTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/WaitForTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/data/WaitForWindowTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/serialization/DeserializationExceptionTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/serialization/IOExceptionTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/serialization/JavascriptExporterTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/serialization/SerializationTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/serialization/TutorialReaderTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/serialization/TutorialWriterTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/DBusExceptionTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/DummyApplication.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/RemoteClassStubs.h trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/RemoteClassTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/RemoteEditorSupportTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/RemoteEventSpyTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/RemoteObjectMapperTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/RemoteObjectTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/TargetApplicationStub.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/TargetApplicationStubWithDelayedRegister.cpp trunk/ktutorial/ktutorial-editor/tests/unit/targetapplication/TargetApplicationTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/util/ExceptionTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/ActionListWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/AutoExpandableTreeViewTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/CommandWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/DialogRunnerTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/EditionDialogTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/LicenseWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/NewWaitForWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/ReactionTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/ReactionWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectChooserFilterModelTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectChooserTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectNameRegisterTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectNameWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectTreeItemUpdaterTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectTreeSelectionManagerTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/SemanticMarkupEditionTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/SemanticMarkupLinkWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/SemanticMarkupParserTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/StepCustomCodeWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/StepDataWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/StepTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/TextTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/TreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/TreeItemUtilTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/TreeModelTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/TutorialCustomCodeWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/TutorialInformationWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/TutorialTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/TutorialTreeSelectionManagerTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForComposedTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForEventTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForEventWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForNotTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForPropertyTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForPropertyWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForSignalTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForSignalWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForStepActivationTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForWidgetTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForWindowTreeItemTest.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/WaitForWindowWidgetTest.cpp trunk/ktutorial/ktutorial-library/src/KTutorial.cpp trunk/ktutorial/ktutorial-library/src/KTutorial.h trunk/ktutorial/ktutorial-library/src/KTutorialCustomization.cpp trunk/ktutorial/ktutorial-library/src/KTutorialCustomization.h trunk/ktutorial/ktutorial-library/src/ObjectFinder.cpp trunk/ktutorial/ktutorial-library/src/ObjectFinder.h trunk/ktutorial/ktutorial-library/src/Option.cpp trunk/ktutorial/ktutorial-library/src/Option.h trunk/ktutorial/ktutorial-library/src/Step.cpp trunk/ktutorial/ktutorial-library/src/Step.h trunk/ktutorial/ktutorial-library/src/Tutorial.cpp trunk/ktutorial/ktutorial-library/src/Tutorial.h trunk/ktutorial/ktutorial-library/src/TutorialInformation.cpp trunk/ktutorial/ktutorial-library/src/TutorialInformation.h trunk/ktutorial/ktutorial-library/src/TutorialManager.cpp trunk/ktutorial/ktutorial-library/src/TutorialManager.h trunk/ktutorial/ktutorial-library/src/WaitFor.cpp trunk/ktutorial/ktutorial-library/src/WaitFor.h trunk/ktutorial/ktutorial-library/src/WaitForAnd.cpp trunk/ktutorial/ktutorial-library/src/WaitForAnd.h trunk/ktutorial/ktutorial-library/src/WaitForComposed.cpp trunk/ktutorial/ktutorial-library/src/WaitForComposed.h trunk/ktutorial/ktutorial-library/src/WaitForEvent.cpp trunk/ktutorial/ktutorial-library/src/WaitForEvent.h trunk/ktutorial/ktutorial-library/src/WaitForNot.cpp trunk/ktutorial/ktutorial-library/src/WaitForNot.h trunk/ktutorial/ktutorial-library/src/WaitForOr.cpp trunk/ktutorial/ktutorial-library/src/WaitForOr.h trunk/ktutorial/ktutorial-library/src/WaitForProperty.cpp trunk/ktutorial/ktutorial-library/src/WaitForProperty.h trunk/ktutorial/ktutorial-library/src/WaitForSignal.cpp trunk/ktutorial/ktutorial-library/src/WaitForSignal.h trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.cpp trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.h trunk/ktutorial/ktutorial-library/src/WaitForWindow.cpp trunk/ktutorial/ktutorial-library/src/WaitForWindow.h trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.cpp trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.h trunk/ktutorial/ktutorial-library/src/customization/DefaultKdeCustomization.cpp trunk/ktutorial/ktutorial-library/src/customization/DefaultKdeCustomization.h trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.h trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.h trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.h trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.h trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.h trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.h trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.h trunk/ktutorial/ktutorial-library/src/extendedinformation/WidgetHighlighter.cpp trunk/ktutorial/ktutorial-library/src/extendedinformation/WidgetHighlighter.h trunk/ktutorial/ktutorial-library/src/extendedinformation/WidgetHighlighterManager.cpp trunk/ktutorial/ktutorial-library/src/extendedinformation/WidgetHighlighterManager.h trunk/ktutorial/ktutorial-library/src/ktutorial_export.h trunk/ktutorial/ktutorial-library/src/scripting/ScriptManager.cpp trunk/ktutorial/ktutorial-library/src/scripting/ScriptManager.h trunk/ktutorial/ktutorial-library/src/scripting/ScriptedStep.cpp trunk/ktutorial/ktutorial-library/src/scripting/ScriptedStep.h trunk/ktutorial/ktutorial-library/src/scripting/ScriptedTutorial.cpp trunk/ktutorial/ktutorial-library/src/scripting/ScriptedTutorial.h trunk/ktutorial/ktutorial-library/src/scripting/ScriptingModule.cpp trunk/ktutorial/ktutorial-library/src/scripting/ScriptingModule.h trunk/ktutorial/ktutorial-library/src/tutorials/UsingKTutorial.cpp trunk/ktutorial/ktutorial-library/src/tutorials/UsingKTutorial.h trunk/ktutorial/ktutorial-library/src/version.h.cmake trunk/ktutorial/ktutorial-library/src/view/StepTextWidget.cpp trunk/ktutorial/ktutorial-library/src/view/StepTextWidget.h trunk/ktutorial/ktutorial-library/src/view/StepWidget.cpp trunk/ktutorial/ktutorial-library/src/view/StepWidget.h trunk/ktutorial/ktutorial-library/src/view/TutorialListModel.cpp trunk/ktutorial/ktutorial-library/src/view/TutorialListModel.h trunk/ktutorial/ktutorial-library/src/view/TutorialManagerDialog.cpp trunk/ktutorial/ktutorial-library/src/view/TutorialManagerDialog.h trunk/ktutorial/ktutorial-library/src/view/WindowOnTopEnforcer.cpp trunk/ktutorial/ktutorial-library/src/view/WindowOnTopEnforcer.h trunk/ktutorial/ktutorial-library/tests/ObjectFinderTest.cpp trunk/ktutorial/ktutorial-library/tests/OptionTest.cpp trunk/ktutorial/ktutorial-library/tests/StepTest.cpp trunk/ktutorial/ktutorial-library/tests/TutorialInformationTest.cpp trunk/ktutorial/ktutorial-library/tests/TutorialManagerTest.cpp trunk/ktutorial/ktutorial-library/tests/TutorialTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForAndTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForComposedTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForEventTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForNotTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForOrTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForPropertyTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForSignalTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForStepActivationTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForWindowTest.cpp trunk/ktutorial/ktutorial-library/tests/common/WindowVisibilitySpyTest.cpp trunk/ktutorial/ktutorial-library/tests/customization/DefaultKdeCustomizationTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/ClassRegisterAdaptorTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/EditorSupportAdaptorTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/EditorSupportTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/EventSpyAdaptorTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/EventSpyTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/ObjectRegisterAdaptorTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/ObjectRegisterTest.cpp trunk/ktutorial/ktutorial-library/tests/extendedinformation/WidgetHighlighterManagerTest.cpp trunk/ktutorial/ktutorial-library/tests/extendedinformation/WidgetHighlighterTest.cpp trunk/ktutorial/ktutorial-library/tests/scripting/ScriptManagerTest.cpp trunk/ktutorial/ktutorial-library/tests/scripting/ScriptedStepTest.cpp trunk/ktutorial/ktutorial-library/tests/scripting/ScriptedTutorialTest.cpp trunk/ktutorial/ktutorial-library/tests/scripting/ScriptingModuleTest.cpp trunk/ktutorial/ktutorial-library/tests/scripting/ScriptingTest.cpp trunk/ktutorial/ktutorial-library/tests/view/StepTextWidgetTest.cpp trunk/ktutorial/ktutorial-library/tests/view/StepWidgetTest.cpp trunk/ktutorial/ktutorial-library/tests/view/TutorialListModelTest.cpp trunk/ktutorial/ktutorial-library/tests/view/TutorialManagerDialogTest.cpp trunk/ktutorial/ktutorial-library/tests/view/WindowOnTopEnforcerTest.cpp trunk/ktutorial/ktutorial-test-app/TestApp.cpp trunk/ktutorial/ktutorial-test-app/TestApp.h trunk/ktutorial/ktutorial-test-app/TutorialClearText.cpp trunk/ktutorial/ktutorial-test-app/TutorialClearText.h trunk/ktutorial/ktutorial-test-app/TutorialClearText.js trunk/ktutorial/ktutorial-test-app/TutorialClearText.py trunk/ktutorial/ktutorial-test-app/TutorialMoveText.cpp trunk/ktutorial/ktutorial-test-app/TutorialMoveText.h trunk/ktutorial/ktutorial-test-app/TutorialMoveText.py trunk/ktutorial/ktutorial-test-app/main.cpp Modified: trunk/ktutorial/ktutorial-editor/src/EditActions.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/EditActions.cpp 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/EditActions.cpp 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/EditActions.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/EditActions.h 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/EditActions.h 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/FileActions.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/FileActions.cpp 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/FileActions.cpp 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/FileActions.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/FileActions.h 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/FileActions.h 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.h 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.h 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/TestTutorialActions.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/TestTutorialActions.cpp 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/TestTutorialActions.cpp 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/TestTutorialActions.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/TestTutorialActions.h 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/TestTutorialActions.h 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/TutorialTester.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/TutorialTester.cpp 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/TutorialTester.cpp 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/TutorialTester.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/TutorialTester.h 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/TutorialTester.h 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/commands/ReactionCommands.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/commands/ReactionCommands.cpp 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/commands/ReactionCommands.cpp 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/commands/ReactionCommands.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/commands/ReactionCommands.h 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/commands/ReactionCommands.h 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/commands/StepCommands.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/commands/StepCommands.cpp 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/commands/StepCommands.cpp 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/commands/StepCommands.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/commands/StepCommands.h 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/commands/StepCommands.h 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/commands/TutorialCommands.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/commands/TutorialCommands.cpp 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/commands/TutorialCommands.cpp 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/commands/TutorialCommands.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/commands/TutorialCommands.h 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/commands/TutorialCommands.h 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/Reaction.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/Reaction.cpp 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/Reaction.cpp 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/Reaction.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/Reaction.h 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/Reaction.h 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/Step.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/Step.cpp 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/Step.cpp 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/Step.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/Step.h 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/Step.h 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/Tutorial.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/Tutorial.cpp 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/Tutorial.cpp 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/Tutorial.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/Tutorial.h 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/Tutorial.h 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitFor.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitFor.cpp 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitFor.cpp 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitFor.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitFor.h 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitFor.h 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForComposed.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForComposed.cpp 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForComposed.cpp 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForComposed.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForComposed.h 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForComposed.h 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForEvent.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForEvent.cpp 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForEvent.cpp 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForEvent.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForEvent.h 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForEvent.h 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForNot.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForNot.cpp 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForNot.cpp 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForNot.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForNot.h 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForNot.h 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForProperty.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForProperty.cpp 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForProperty.cpp 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForProperty.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForProperty.h 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForProperty.h 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForSignal.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForSignal.cpp 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForSignal.cpp 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForSignal.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForSignal.h 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForSignal.h 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForStepActivation.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForStepActivation.cpp 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForStepActivation.cpp 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/WaitForStepActivation.h =================================================================== --- trunk/ktutorial/ktutorial-editor/src/data/WaitForStepActivation.h 2012-08-30 14:50:46 UTC (rev 384) +++ trunk/ktutorial/ktutorial-editor/src/data/WaitForStepActivation.h 2012-09-04 14:47:27 UTC (rev 385) @@ -4,7 +4,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * + * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * Modified: trunk/ktutorial/ktutorial-editor/src/data/Wai... [truncated message content] |
From: <dan...@us...> - 2012-08-30 14:50:56
|
Revision: 384 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=384&view=rev Author: danxuliu Date: 2012-08-30 14:50:46 +0000 (Thu, 30 Aug 2012) Log Message: ----------- Change video player priorities, as nowadays the native ogg support is common, and the cortado version used in the page does not seem to work with current Firefox releases. Modified Paths: -------------- trunk/web-src/data/script/ogg.js Modified: trunk/web-src/data/script/ogg.js =================================================================== --- trunk/web-src/data/script/ogg.js 2012-08-30 14:34:37 UTC (rev 383) +++ trunk/web-src/data/script/ogg.js 2012-08-30 14:50:46 UTC (rev 384) @@ -25,7 +25,7 @@ // List of players in order of preference // Downpreffed VLC because it crashes my browser all the damn time -- TS - 'players': ['cortado', 'quicktime-mozilla', 'quicktime-activex', 'vlc-mozilla', 'vlc-activex', 'totem', 'kmplayer', 'kaffeine', 'mplayerplug-in', 'oggPlugin', 'videoElement'], + 'players': ['oggPlugin', 'videoElement', 'totem', 'kmplayer', 'kaffeine', 'mplayerplug-in', 'cortado', 'quicktime-mozilla', 'quicktime-activex', 'vlc-mozilla', 'vlc-activex'], // Client support table 'clientSupports': { 'thumbnail' : true }, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-08-30 14:34:51
|
Revision: 383 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=383&view=rev Author: danxuliu Date: 2012-08-30 14:34:37 +0000 (Thu, 30 Aug 2012) Log Message: ----------- Add news, videos and sources for the "example of KTutorial for the real world" series of the blog. Modified Paths: -------------- trunk/web-src/newsList.xml trunk/web-src/pages/index.xml trunk/web-src/pages/news.xml trunk/web-src/pages/screenshots.xml Added Paths: ----------- trunk/web-src/data/files/examples/ trunk/web-src/data/files/examples/gwenview-fullScreenInterface.xml trunk/web-src/data/files/examples/gwenview.patch trunk/web-src/data/files/examples/kdenlive-simpleSlideTransitionBetweenTwoClips.xml trunk/web-src/data/files/examples/kdenlive.patch trunk/web-src/data/files/examples/showfoto-levelsAdjust.xml trunk/web-src/data/files/examples/showfoto.patch trunk/web-src/data/files/gwenview-fullScreenInterface.ogv trunk/web-src/data/files/gwenview-fullScreenInterface.png trunk/web-src/data/files/kdenlive-simpleSlideTransitionBetweenTwoClips.ogv trunk/web-src/data/files/kdenlive-simpleSlideTransitionBetweenTwoClips.png trunk/web-src/data/files/showfoto-levelsAdjust.ogv trunk/web-src/data/files/showfoto-levelsAdjust.png Added: trunk/web-src/data/files/examples/gwenview-fullScreenInterface.xml =================================================================== --- trunk/web-src/data/files/examples/gwenview-fullScreenInterface.xml (rev 0) +++ trunk/web-src/data/files/examples/gwenview-fullScreenInterface.xml 2012-08-30 14:34:37 UTC (rev 383) @@ -0,0 +1,129 @@ +<?xml version="1.0" encoding="utf-8"?> +<tutorial name="Full screen interface"> + <description>An overview of the full screen interface of Gwenview.</description> + <step id="start"> + <text><para>Gwenview features two modes: browse and view. In versions prior to 2.9 only the view mode had also a full screen interface. In Gwenview 2.9 a full screen interface was added for the browse mode too.</para> + +<para>This tutorial will show you an overview of the full screen interface for browse and view modes. We will start by looking at the full screen browse mode, so browse to a folder with several images and, then, change to full screen.</para> + +<para>To change to full screen you can click on the <interface>Full screen</interface> button in the <link url="widget:mainToolBar">tool bar</link>, or click on the <interface>View|Full screen mode</interface> menu item in the menu bar.</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForComposed compositionType="And"> + <waitForStepActivation/> + <waitForProperty objectName="StartMainPage" propertyName="visible" value="true"/> + </waitForComposed> + <nextStep id="start when start page is selected"/> + </reaction> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForComposed compositionType="And"> + <waitForStepActivation/> + <waitForProperty objectName="StartMainPage" propertyName="visible" value="false"/> + <waitForProperty objectName="BrowseMainPage" propertyName="visible" value="false"/> + </waitForComposed> + <nextStep id="start when view page is selected"/> + </reaction> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForSignal emitterName="fullscreen" signalName="triggered()"/> + <nextStep id="fullscreen browse mode"/> + </reaction> + </step> + <step id="start when start page is selected"> + <text><para>Gwenview features two modes: browse and view. In versions prior to 2.9 only the view mode had also a full screen interface. In Gwenview 2.9 a full screen interface was added for the browse mode too.</para> + +<para>This tutorial will show you an overview of the full screen interface for browse and view modes. We will start by looking at the full screen browse mode so, first, change to browse mode.</para> + +<para>You can change to browse mode from the start page by double clicking on any of your <link url="widget:mHistoryWidget">recent folders</link> or by single clicking on any of your <link url="widget:mPlacesTagsWidget">places</link>.</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForSignal emitterName="browse" signalName="triggered()"/> + <nextStep id="enter fullscreen in browser mode"/> + </reaction> + </step> + <step id="start when view page is selected"> + <text><para>Gwenview features two modes: browse and view. In versions prior to 2.9 only the view mode had also a full screen interface. In Gwenview 2.9 a full screen interface was added for the browse mode too.</para> + +<para>This tutorial will show you an overview of the full screen interface for browse and view modes. We will start by looking at the full screen browse mode so, first, change to browse mode.</para> + +<para>You can change to browse mode from the view mode by clicking on the <interface>Browse</interface> button in the <link url="widget:mainToolBar">tool bar</link>, or by clicking on the <interface>View|Browse</interface> menu item in the menu bar.</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForSignal emitterName="browse" signalName="triggered()"/> + <nextStep id="enter fullscreen in browser mode"/> + </reaction> + </step> + <step id="enter fullscreen in browser mode"> + <text><para>Now browse to a folder with several images. Then, change to full screen.</para> + +<para>To change to full screen you can click on the <interface>Full screen</interface> button in the <link url="widget:mainToolBar">tool bar</link>, or click on the <interface>View|Full screen mode</interface> menu item in the menu bar.</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForSignal emitterName="fullscreen" signalName="triggered()"/> + <nextStep id="fullscreen browse mode"/> + </reaction> + </step> + <step id="fullscreen browse mode"> + <text><para>As you can see, the full screen interface for browse mode is pretty much the same as the normal interface. However, it does not have a menu bar, and neither a tool bar.</para> + +<para>It does have, though, a <link url="widget:mStatusBarContainer">status bar</link>, so you can use it to <link url="widget:mToggleSideBarButton">show or hide the side bar</link>, or <link url="widget:mThumbnailSlider">change the size of the thumbnails</link>. It also contains a top bar with a few buttons and the <link url="widget:mUrlNavigatorContainer">navigation bar</link> showing the current folder path.</para> + +<para>As the full screen interface for the browse mode is pretty much like its normal interface we will change now to the full screen view mode.</para> + +<para>To change to the view mode, select an image and then click on the view mode button in the top bar (its icon is a single picture).</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForSignal emitterName="view" signalName="triggered()"/> + <nextStep id="fullscreen view mode"/> + </reaction> + </step> + <step id="fullscreen view mode"> + <text><para>The full screen interface for the view mode differs a lot more from its normal interface. The full screen interface only contains the selected image (or images) and an <link url="widget:fullScreenBar">auto-hiding top bar</link> (move the cursor to the top of the screen and the bar will appear, move the cursor outside the bar and the bar will dissapear).</para> + +<para>This full screen interface is designed to show a slideshow of your images. The slideshow (and other details of the full screen interface) can be configured clicking on the <interface>Configuration</interface> button in the top bar.</para> + +<para>Now start the slideshow. To do this, just click on the <interface>Start slideshow</interface> button (its icon is a <emphasis>Play</emphasis> icon) in the top bar.</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForSignal emitterName="toggle_slideshow" signalName="triggered()"/> + <nextStep id="slideshow"/> + </reaction> + </step> + <step id="slideshow"> + <text><para>The slideshow starts from the current image and shows all the images in the current folder, stopping at the last one (unless you check the <interface>Loop</interface> option in the configuration, in which case it will go back to the first image and continue the slideshow). Depending on the interval set in the configuration the images will change faster or slower.</para> + +<para>Stop the slideshow clicking on the same button in the top bar that you used to start it (this time its icon will have changed to a pause or stop icon).</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForSignal emitterName="toggle_slideshow" signalName="triggered()"/> + <nextStep id="change to browse mode from view mode"/> + </reaction> + </step> + <step id="change to browse mode from view mode"> + <text><para>Besides the automatic image change performed by the slideshow you can change the current image using the <interface>Previous</interface> and <interface>Next</interface> buttons in the top bar, or clicking on a specific image in the thumbnail list (which can be shown or hidden in the <interface>Configuration</interface>).</para> + +<para>You can also change to full screen browse mode to select the image there. To do this, just click in the browse mode button in the top bar (its icon is a browser with several files).</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForSignal emitterName="browse" signalName="triggered()"/> + <nextStep id="change back to view mode"/> + </reaction> + </step> + <step id="change back to view mode"> + <text><para>After selecting the desired image you can go back to the full screen view mode like the first time, that is, clicking on the view mode button in the top bar.</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForSignal emitterName="view" signalName="triggered()"/> + <nextStep id="zoom in"/> + </reaction> + </step> + <step id="zoom in"> + <text><para>Even if the full screen view mode shows the image fit to the screen size you can still zoom it in.</para> + +<para>Click with the right mouse button in the image. Then, in the menu that pop ups, click on <interface>Zoom in</interface>.</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForSignal emitterName="view_zoom_in" signalName="triggered()"/> + <nextStep id="leave fullscreen mode"/> + </reaction> + </step> + <step id="leave fullscreen mode"> + <text><para>Changing to the normal interface from the full screen interface is done in the same way in the view mode and in the browse mode. Just click in the <interface>Leave fullscreen</interface> button in the top bar.</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForSignal emitterName="leave_fullscreen" signalName="triggered()"/> + <nextStep id="end"/> + </reaction> + </step> + <step id="end"> + <text><para>And that is all. We have seen how to use the full screen interface for both the browse and view modes.</para></text> + </step> +</tutorial> Added: trunk/web-src/data/files/examples/gwenview.patch =================================================================== --- trunk/web-src/data/files/examples/gwenview.patch (rev 0) +++ trunk/web-src/data/files/examples/gwenview.patch 2012-08-30 14:34:37 UTC (rev 383) @@ -0,0 +1,307 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d1a192d..d79dbf5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -45,6 +45,9 @@ endif (NOT GWENVIEW_SEMANTICINFO_BACKEND_NONE) + find_package(LibKonq) + macro_log_feature(LIBKONQ_FOUND "libkonq" "Provides file management features" "http://www.kde.org" TRUE "" "") + ++macro_optional_find_package(KTutorial "0.5") ++macro_log_feature(KTUTORIAL_FOUND "KTutorial" "Provides interactive tutorials support" "http://ktutorial.sourceforge.net" FALSE "0.5") ++ + ## Global settings + + # Avoid some build-time warnings in Nepomuk +@@ -73,6 +76,7 @@ add_subdirectory(icons) + add_subdirectory(cursors) + add_subdirectory(color-schemes) + add_subdirectory(doc) ++add_subdirectory(tutorials) + + configure_file(config-gwenview.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gwenview.h) + +diff --git a/Messages.sh b/Messages.sh +index 6462d4e..078872d 100644 +--- a/Messages.sh ++++ b/Messages.sh +@@ -1,3 +1,3 @@ + #! /bin/sh + $EXTRACTRC `find . -name "*.ui" -o -name "*.rc" -o -name "*.kcfg" ` >> rc.cpp +-$XGETTEXT `find . -name "*.cpp" -o -name "*.h"` -o $podir/gwenview.pot ++$XGETTEXT `find . -name "*.cpp" -o -name "*.h"` `find tutorials -name "*.js"` -o $podir/gwenview.pot +diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt +index e039198..0478d5d 100644 +--- a/app/CMakeLists.txt ++++ b/app/CMakeLists.txt +@@ -9,6 +9,11 @@ if (KIPI_FOUND) + include_directories(${KIPI_INCLUDE_DIR}) + endif (KIPI_FOUND) + ++if(KTUTORIAL_FOUND) ++ add_definitions(-DKTUTORIAL_FOUND) ++ include_directories(${KTUTORIAL_INCLUDE_DIRS}) ++endif(KTUTORIAL_FOUND) ++ + # For lib/gwenviewconfig.h and config-gwenview.h + include_directories( + ${CMAKE_CURRENT_BINARY_DIR}/.. +@@ -96,6 +101,10 @@ if (NOT GWENVIEW_SEMANTICINFO_BACKEND_NONE) + target_link_libraries(gwenview ${NEPOMUK_LIBRARIES}) + endif (NOT GWENVIEW_SEMANTICINFO_BACKEND_NONE) + ++if(KTUTORIAL_FOUND) ++ target_link_libraries(gwenview ${KTUTORIAL_LIBRARIES}) ++endif(KTUTORIAL_FOUND) ++ + install(TARGETS gwenview + ${INSTALL_TARGETS_DEFAULT_ARGS}) + +diff --git a/app/gwenviewui.rc b/app/gwenviewui.rc +index 0b1baad..da0e4a7 100644 +--- a/app/gwenviewui.rc ++++ b/app/gwenviewui.rc +@@ -86,6 +86,9 @@ + <Action name="options_configure_toolbars"/> + <Action name="options_configure"/> + </Menu> ++ <Menu name="help"> ++ <DefineGroup name="ktutorial"/> ++ </Menu> + </MenuBar> + + <ToolBar name="mainToolBar" noMerge="1"> +diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp +index 27d9584..682a8b8 100644 +--- a/app/mainwindow.cpp ++++ b/app/mainwindow.cpp +@@ -60,6 +60,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + #include <KXMLGUIFactory> + #include <KWindowSystem> + ++#ifdef KTUTORIAL_FOUND ++#include <ktutorial/KTutorial.h> ++#endif ++ + // Local + #include "configdialog.h" + #include "contextmanager.h" +@@ -852,6 +856,15 @@ MainWindow::MainWindow() + updatePreviousNextActions(); + d->mSaveBar->initActionDependentWidgets(); + ++#ifdef KTUTORIAL_FOUND ++ //Hack to make actions usable by KTutorial. ++ foreach (QAction* action, actionCollection()->actions()) { ++ action->setParent(this); ++ } ++ ++ ktutorial::KTutorial::self()->setup(this); ++#endif ++ + createGUI(); + loadConfig(); + +diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt +new file mode 100644 +index 0000000..f6f836a +--- /dev/null ++++ b/tutorials/CMakeLists.txt +@@ -0,0 +1 @@ ++install(FILES fullScreenInterface.js DESTINATION ${DATA_INSTALL_DIR}/gwenview/tutorials/) +diff --git a/tutorials/fullScreenInterface.js b/tutorials/fullScreenInterface.js +new file mode 100644 +index 0000000..0c4153d +--- /dev/null ++++ b/tutorials/fullScreenInterface.js +@@ -0,0 +1,191 @@ ++t = Kross.module("kdetranslation"); ++ ++tutorial.tutorialInformationAsObject().setName(t.i18n("Full screen interface")); ++tutorial.tutorialInformationAsObject().setDescription(t.i18n("An overview of the full screen interface of Gwenview.")); ++ ++//Step start ++startStep = ktutorial.newStep("start"); ++startStep.setText(t.i18nc("@info", "<para>Gwenview features two modes: browse and view. In versions prior to 2.9 only the view mode had also a full screen interface. In Gwenview 2.9 a full screen interface was added for the browse mode too.</para>\n\n<para>This tutorial will show you an overview of the full screen interface for browse and view modes. We will start by looking at the full screen browse mode, so browse to a folder with several images and, then, change to full screen.</para>\n\n<para>To change to full screen you can click on the <interface>Full screen</interface> button in the <link url=\"widget:mainToolBar\">tool bar</link>, or click on the <interface>View|Full screen mode</interface> menu item in the menu bar.</para>")); ++ ++function startStepSetup(step) { ++ waitForStepActivation = ktutorial.newWaitFor("WaitForStepActivation"); ++ waitForStepActivation.setStep(tutorial, step); ++ ++ waitForVisibleInStartMainPage = ktutorial.newWaitFor("WaitForProperty"); ++ waitForVisibleInStartMainPage.setProperty(ktutorial.findObject("StartMainPage"), "visible", true); ++ ++ waitForAnd = ktutorial.newWaitFor("WaitForAnd"); ++ waitForAnd.add(waitForStepActivation); ++ waitForAnd.add(waitForVisibleInStartMainPage); ++ step.addWaitFor(waitForAnd, "start when start page is selected"); ++ ++ waitForStepActivation2 = ktutorial.newWaitFor("WaitForStepActivation"); ++ waitForStepActivation2.setStep(tutorial, step); ++ ++ waitForVisibleInStartMainPage2 = ktutorial.newWaitFor("WaitForProperty"); ++ waitForVisibleInStartMainPage2.setProperty(ktutorial.findObject("StartMainPage"), "visible", false); ++ ++ waitForVisibleInBrowseMainPage = ktutorial.newWaitFor("WaitForProperty"); ++ waitForVisibleInBrowseMainPage.setProperty(ktutorial.findObject("BrowseMainPage"), "visible", false); ++ ++ waitForAnd2 = ktutorial.newWaitFor("WaitForAnd"); ++ waitForAnd2.add(waitForStepActivation2); ++ waitForAnd2.add(waitForVisibleInStartMainPage2); ++ waitForAnd2.add(waitForVisibleInBrowseMainPage); ++ step.addWaitFor(waitForAnd2, "start when view page is selected"); ++ ++ waitForTriggeredByFullscreen = ktutorial.newWaitFor("WaitForSignal"); ++ waitForTriggeredByFullscreen.setSignal(ktutorial.findObject("fullscreen"), "triggered()"); ++ step.addWaitFor(waitForTriggeredByFullscreen, "fullscreen browse mode"); ++} ++connect(startStep, "setup(QObject*)", ++ this, "startStepSetup(QObject*)"); ++ ++tutorial.addStep(startStep); ++ ++//Step start when start page is selected ++startWhenStartPageIsSelectedStep = ktutorial.newStep("start when start page is selected"); ++startWhenStartPageIsSelectedStep.setText(t.i18nc("@info", "<para>Gwenview features two modes: browse and view. In versions prior to 2.9 only the view mode had also a full screen interface. In Gwenview 2.9 a full screen interface was added for the browse mode too.</para>\n\n<para>This tutorial will show you an overview of the full screen interface for browse and view modes. We will start by looking at the full screen browse mode so, first, change to browse mode.</para>\n\n<para>You can change to browse mode from the start page by double clicking on any of your <link url=\"widget:mHistoryWidget\">recent folders</link> or by single clicking on any of your <link url=\"widget:mPlacesTagsWidget\">places</link>.</para>")); ++ ++function startWhenStartPageIsSelectedStepSetup(step) { ++ waitForTriggeredByBrowse = ktutorial.newWaitFor("WaitForSignal"); ++ waitForTriggeredByBrowse.setSignal(ktutorial.findObject("browse"), "triggered()"); ++ step.addWaitFor(waitForTriggeredByBrowse, "enter fullscreen in browser mode"); ++} ++connect(startWhenStartPageIsSelectedStep, "setup(QObject*)", ++ this, "startWhenStartPageIsSelectedStepSetup(QObject*)"); ++ ++tutorial.addStep(startWhenStartPageIsSelectedStep); ++ ++//Step start when view page is selected ++startWhenViewPageIsSelectedStep = ktutorial.newStep("start when view page is selected"); ++startWhenViewPageIsSelectedStep.setText(t.i18nc("@info", "<para>Gwenview features two modes: browse and view. In versions prior to 2.9 only the view mode had also a full screen interface. In Gwenview 2.9 a full screen interface was added for the browse mode too.</para>\n\n<para>This tutorial will show you an overview of the full screen interface for browse and view modes. We will start by looking at the full screen browse mode so, first, change to browse mode.</para>\n\n<para>You can change to browse mode from the view mode by clicking on the <interface>Browse</interface> button in the <link url=\"widget:mainToolBar\">tool bar</link>, or by clicking on the <interface>View|Browse</interface> menu item in the menu bar.</para>")); ++ ++function startWhenViewPageIsSelectedStepSetup(step) { ++ waitForTriggeredByBrowse = ktutorial.newWaitFor("WaitForSignal"); ++ waitForTriggeredByBrowse.setSignal(ktutorial.findObject("browse"), "triggered()"); ++ step.addWaitFor(waitForTriggeredByBrowse, "enter fullscreen in browser mode"); ++} ++connect(startWhenViewPageIsSelectedStep, "setup(QObject*)", ++ this, "startWhenViewPageIsSelectedStepSetup(QObject*)"); ++ ++tutorial.addStep(startWhenViewPageIsSelectedStep); ++ ++//Step enter fullscreen in browser mode ++enterFullscreenInBrowserModeStep = ktutorial.newStep("enter fullscreen in browser mode"); ++enterFullscreenInBrowserModeStep.setText(t.i18nc("@info", "<para>Now browse to a folder with several images. Then, change to full screen.</para>\n\n<para>To change to full screen you can click on the <interface>Full screen</interface> button in the <link url=\"widget:mainToolBar\">tool bar</link>, or click on the <interface>View|Full screen mode</interface> menu item in the menu bar.</para>")); ++ ++function enterFullscreenInBrowserModeStepSetup(step) { ++ waitForTriggeredByFullscreen = ktutorial.newWaitFor("WaitForSignal"); ++ waitForTriggeredByFullscreen.setSignal(ktutorial.findObject("fullscreen"), "triggered()"); ++ step.addWaitFor(waitForTriggeredByFullscreen, "fullscreen browse mode"); ++} ++connect(enterFullscreenInBrowserModeStep, "setup(QObject*)", ++ this, "enterFullscreenInBrowserModeStepSetup(QObject*)"); ++ ++tutorial.addStep(enterFullscreenInBrowserModeStep); ++ ++//Step fullscreen browse mode ++fullscreenBrowseModeStep = ktutorial.newStep("fullscreen browse mode"); ++fullscreenBrowseModeStep.setText(t.i18nc("@info", "<para>As you can see, the full screen interface for browse mode is pretty much the same as the normal interface. However, it does not have a menu bar, and neither a tool bar.</para>\n\n<para>It does have, though, a <link url=\"widget:mStatusBarContainer\">status bar</link>, so you can use it to <link url=\"widget:mToggleSideBarButton\">show or hide the side bar</link>, or <link url=\"widget:mThumbnailSlider\">change the size of the thumbnails</link>. It also contains a top bar with a few buttons and the <link url=\"widget:mUrlNavigatorContainer\">navigation bar</link> showing the current folder path.</para>\n\n<para>As the full screen interface for the browse mode is pretty much like its normal interface we will change now to the full screen view mode.</para>\n\n<para>To change to the view mode, select an image and then click on the view mode button in the top bar (its icon is a single picture).</para>")); ++ ++function fullscreenBrowseModeStepSetup(step) { ++ waitForTriggeredByView = ktutorial.newWaitFor("WaitForSignal"); ++ waitForTriggeredByView.setSignal(ktutorial.findObject("view"), "triggered()"); ++ step.addWaitFor(waitForTriggeredByView, "fullscreen view mode"); ++} ++connect(fullscreenBrowseModeStep, "setup(QObject*)", ++ this, "fullscreenBrowseModeStepSetup(QObject*)"); ++ ++tutorial.addStep(fullscreenBrowseModeStep); ++ ++//Step fullscreen view mode ++fullscreenViewModeStep = ktutorial.newStep("fullscreen view mode"); ++fullscreenViewModeStep.setText(t.i18nc("@info", "<para>The full screen interface for the view mode differs a lot more from its normal interface. The full screen interface only contains the selected image (or images) and an <link url=\"widget:fullScreenBar\">auto-hiding top bar</link> (move the cursor to the top of the screen and the bar will appear, move the cursor outside the bar and the bar will dissapear).</para>\n\n<para>This full screen interface is designed to show a slideshow of your images. The slideshow (and other details of the full screen interface) can be configured clicking on the <interface>Configuration</interface> button in the top bar.</para>\n\n<para>Now start the slideshow. To do this, just click on the <interface>Start slideshow</interface> button (its icon is a <emphasis>Play</emphasis> icon) in the top bar.</para>")); ++ ++function fullscreenViewModeStepSetup(step) { ++ waitForTriggeredByToggle_slideshow = ktutorial.newWaitFor("WaitForSignal"); ++ waitForTriggeredByToggle_slideshow.setSignal(ktutorial.findObject("toggle_slideshow"), "triggered()"); ++ step.addWaitFor(waitForTriggeredByToggle_slideshow, "slideshow"); ++} ++connect(fullscreenViewModeStep, "setup(QObject*)", ++ this, "fullscreenViewModeStepSetup(QObject*)"); ++ ++tutorial.addStep(fullscreenViewModeStep); ++ ++//Step slideshow ++slideshowStep = ktutorial.newStep("slideshow"); ++slideshowStep.setText(t.i18nc("@info", "<para>The slideshow starts from the current image and shows all the images in the current folder, stopping at the last one (unless you check the <interface>Loop</interface> option in the configuration, in which case it will go back to the first image and continue the slideshow). Depending on the interval set in the configuration the images will change faster or slower.</para>\n\n<para>Stop the slideshow clicking on the same button in the top bar that you used to start it (this time its icon will have changed to a pause or stop icon).</para>")); ++ ++function slideshowStepSetup(step) { ++ waitForTriggeredByToggle_slideshow = ktutorial.newWaitFor("WaitForSignal"); ++ waitForTriggeredByToggle_slideshow.setSignal(ktutorial.findObject("toggle_slideshow"), "triggered()"); ++ step.addWaitFor(waitForTriggeredByToggle_slideshow, "change to browse mode from view mode"); ++} ++connect(slideshowStep, "setup(QObject*)", ++ this, "slideshowStepSetup(QObject*)"); ++ ++tutorial.addStep(slideshowStep); ++ ++//Step change to browse mode from view mode ++changeToBrowseModeFromViewModeStep = ktutorial.newStep("change to browse mode from view mode"); ++changeToBrowseModeFromViewModeStep.setText(t.i18nc("@info", "<para>Besides the automatic image change performed by the slideshow you can change the current image using the <interface>Previous</interface> and <interface>Next</interface> buttons in the top bar, or clicking on a specific image in the thumbnail list (which can be shown or hidden in the <interface>Configuration</interface>).</para>\n\n<para>You can also change to full screen browse mode to select the image there. To do this, just click in the browse mode button in the top bar (its icon is a browser with several files).</para>")); ++ ++function changeToBrowseModeFromViewModeStepSetup(step) { ++ waitForTriggeredByBrowse = ktutorial.newWaitFor("WaitForSignal"); ++ waitForTriggeredByBrowse.setSignal(ktutorial.findObject("browse"), "triggered()"); ++ step.addWaitFor(waitForTriggeredByBrowse, "change back to view mode"); ++} ++connect(changeToBrowseModeFromViewModeStep, "setup(QObject*)", ++ this, "changeToBrowseModeFromViewModeStepSetup(QObject*)"); ++ ++tutorial.addStep(changeToBrowseModeFromViewModeStep); ++ ++//Step change back to view mode ++changeBackToViewModeStep = ktutorial.newStep("change back to view mode"); ++changeBackToViewModeStep.setText(t.i18nc("@info", "<para>After selecting the desired image you can go back to the full screen view mode like the first time, that is, clicking on the view mode button in the top bar.</para>")); ++ ++function changeBackToViewModeStepSetup(step) { ++ waitForTriggeredByView = ktutorial.newWaitFor("WaitForSignal"); ++ waitForTriggeredByView.setSignal(ktutorial.findObject("view"), "triggered()"); ++ step.addWaitFor(waitForTriggeredByView, "zoom in"); ++} ++connect(changeBackToViewModeStep, "setup(QObject*)", ++ this, "changeBackToViewModeStepSetup(QObject*)"); ++ ++tutorial.addStep(changeBackToViewModeStep); ++ ++//Step zoom in ++zoomInStep = ktutorial.newStep("zoom in"); ++zoomInStep.setText(t.i18nc("@info", "<para>Even if the full screen view mode shows the image fit to the screen size you can still zoom it in.</para>\n\n<para>Click with the right mouse button in the image. Then, in the menu that pop ups, click on <interface>Zoom in</interface>.</para>")); ++ ++function zoomInStepSetup(step) { ++ waitForTriggeredByView_zoom_in = ktutorial.newWaitFor("WaitForSignal"); ++ waitForTriggeredByView_zoom_in.setSignal(ktutorial.findObject("view_zoom_in"), "triggered()"); ++ step.addWaitFor(waitForTriggeredByView_zoom_in, "leave fullscreen mode"); ++} ++connect(zoomInStep, "setup(QObject*)", ++ this, "zoomInStepSetup(QObject*)"); ++ ++tutorial.addStep(zoomInStep); ++ ++//Step leave fullscreen mode ++leaveFullscreenModeStep = ktutorial.newStep("leave fullscreen mode"); ++leaveFullscreenModeStep.setText(t.i18nc("@info", "<para>Changing to the normal interface from the full screen interface is done in the same way in the view mode and in the browse mode. Just click in the <interface>Leave fullscreen</interface> button in the top bar.</para>")); ++ ++function leaveFullscreenModeStepSetup(step) { ++ waitForTriggeredByLeave_fullscreen = ktutorial.newWaitFor("WaitForSignal"); ++ waitForTriggeredByLeave_fullscreen.setSignal(ktutorial.findObject("leave_fullscreen"), "triggered()"); ++ step.addWaitFor(waitForTriggeredByLeave_fullscreen, "end"); ++} ++connect(leaveFullscreenModeStep, "setup(QObject*)", ++ this, "leaveFullscreenModeStepSetup(QObject*)"); ++ ++tutorial.addStep(leaveFullscreenModeStep); ++ ++//Step end ++endStep = ktutorial.newStep("end"); ++endStep.setText(t.i18nc("@info", "<para>And that is all. We have seen how to use the full screen interface for both the browse and view modes.</para>")); ++ ++tutorial.addStep(endStep); ++ Added: trunk/web-src/data/files/examples/kdenlive-simpleSlideTransitionBetweenTwoClips.xml =================================================================== --- trunk/web-src/data/files/examples/kdenlive-simpleSlideTransitionBetweenTwoClips.xml (rev 0) +++ trunk/web-src/data/files/examples/kdenlive-simpleSlideTransitionBetweenTwoClips.xml 2012-08-30 14:34:37 UTC (rev 383) @@ -0,0 +1,202 @@ +<?xml version="1.0" encoding="utf-8"?> +<tutorial name="Simple slide transition between two clips"> + <description>Basic usage of "slide" transition.</description> + <license>Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> + +This tutorial is licensed under the Creative Commons Attribution-ShareAlike License (http://creativecommons.org/licenses/by-sa/3.0/).</license> + <step id="start"> + <text><para>In this tutorial you will learn how to add a <emphasis>slide</emphasis> transition between two clips and how to do some basic changes in the transition.</para> + +<para>For this tutorial you will need a project with at least two video tracks in the <link url="widget:TimeLine_UI">timeline</link>, and you will need too two clips.</para> + +<para>Do you want to use your own clips, or do you want to add two example clips just for this tutorial?</para></text> + <reaction triggerType="OptionSelected" responseType="NextStep"> + <option name="I will use my own clips"/> + <nextStep id="add clips to timeline"/> + </reaction> + <reaction triggerType="OptionSelected" responseType="NextStep"> + <option name="Let's add the example clips"/> + <nextStep id="add the first color clip"/> + </reaction> + </step> + <step id="add the first color clip"> + <text><para>First, we will add a new color clip.</para> + +<para>To do this there are several options: +<list> +<item>In the menu bar, you can select <interface>Project|Add color clip</interface>.</item> + +<item>In the <link url="widget:project_tree">project tree</link>, you can click with the right mouse button on the clip list and then select <interface>Add color clip</interface>.</item> + +<item>In the project tree, you can click with the left mouse button on the arrow near to the <interface>Add clip</interface> button (its icon is a film with a <emphasis>+</emphasis> sign), and then select <interface>Add color clip</interface>.</item> +</list> +</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForWindow windowObjectName="ColorClip_UI"/> + <nextStep id="set name for first color clip"/> + </reaction> + </step> + <step id="set name for first color clip"> + <text><para>In the dialog that has just been opened, change the <link url="widget:clip_name">clip name</link> to <emphasis>First clip</emphasis>.</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForProperty objectName="clip_name" propertyName="text" value="t.i18n("First clip")"/> + <nextStep id="set color for first color clip"/> + </reaction> + </step> + <step id="set color for first color clip"> + <text><para>Change the <link url="widget:clip_color">color</link> to black.</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForComposed compositionType="And"> + <waitForStepActivation/> + <waitForProperty objectName="clip_color" propertyName="color" value=""#000000""/> + </waitForComposed> + <nextStep id="set duration for first color clip"/> + </reaction> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForProperty objectName="clip_color" propertyName="color" value=""#000000""/> + <nextStep id="set duration for first color clip"/> + </reaction> + </step> + <step id="set duration for first color clip"> + <text>Set the clip duration to something around 4 or 5 seconds and then accept the dialog.</text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForSignal emitterName="ColorClip_UI" signalName="accepted()"/> + <nextStep id="add the second color clip"/> + </reaction> + </step> + <step id="add the second color clip"> + <text><para>Now add another new color clip.</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForWindow windowObjectName="ColorClip_UI"/> + <nextStep id="set name for second color clip"/> + </reaction> + </step> + <step id="set name for second color clip"> + <text><para>Change the <link url="widget:clip_name">clip name</link> to <emphasis>Second clip</emphasis>.</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForProperty objectName="clip_name" propertyName="text" value="t.i18n("Second clip")"/> + <nextStep id="set color for second color clip"/> + </reaction> + </step> + <step id="set color for second color clip"> + <text><para>Change the <link url="widget:clip_color">color</link> to white.</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForComposed compositionType="And"> + <waitForStepActivation/> + <waitForProperty objectName="clip_color" propertyName="color" value=""#FFFFFF""/> + </waitForComposed> + <nextStep id="set duration for second color clip"/> + </reaction> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForProperty objectName="clip_color" propertyName="color" value=""#FFFFFF""/> + <nextStep id="set duration for second color clip"/> + </reaction> + </step> + <step id="set duration for second color clip"> + <text>Set the clip duration to something around 4 or 5 seconds and then accept the dialog.</text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForSignal emitterName="ColorClip_UI" signalName="accepted()"/> + <nextStep id="add clips to timeline"/> + </reaction> + </step> + <step id="add clips to timeline"> + <text><para>Add the first clip to a video track in the <link url="widget:tracks_frame">timeline</link>. The track must have at least another video track below it.</para> + +<para>Then add the second clip to the track below the track of the first clip. Make sure that the two clips overlap by one or two seconds.</para> + +<para>Now it is time to add the <emphasis>slide</emphasis> transition. Look at the first clip in the timeline. One of its lower corners overlaps the second clip. Put the cursor on that corner, and an arrow will appear on it. Then, click with the right button of the mouse and, in the menu that pops up, select <interface>Add transition|Slide</interface>.</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForSignal emitterName="transition_slide" signalName="activated()"/> + <nextStep id="select slide transition"/> + </reaction> + </step> + <step id="select slide transition"> + <text><para>A <emphasis>slide</emphasis> transition has been added between the first and the second clip. You can see it by the yellow rectangle placed between the clips, in the area they overlap.</para> + +<para>Click with the left mouse button on that yellow rectangle to see the transition properties. Note that if you click in the upper part or in the lower part of the yellow rectangle you may select the clips instead; if that happens, just try again to select the yellow rectangle.</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForComposed compositionType="And"> + <waitForStepActivation/> + <waitForProperty objectName="transition" propertyName="visible" value="false"/> + </waitForComposed> + <nextStep id="select slide transition when transition dock is hidden"/> + </reaction> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForComposed compositionType="And"> + <waitForEvent receiverName="transitionList" eventName="EnabledChange"/> + <waitForProperty objectName="transitionList" propertyName="enabled" value="true"/> + </waitForComposed> + <nextStep id="change slide transition length"/> + </reaction> + </step> + <step id="select slide transition when transition dock is hidden"> + <text><para>A <emphasis>slide</emphasis> transition has been added between the first and the second clip. You can see it by the yellow rectangle placed between the clips, in the area they overlap.</para> + +<para>The transition panel is hidden. Before going any further, show that panel to be able to see the transition properties (<interface>View|Transition</interface>).</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForComposed compositionType="And"> + <waitForProperty objectName="TransitionSettings_UI" propertyName="visible" value="true"/> + <waitForEvent receiverName="TransitionSettings_UI" eventName="Show"/> + </waitForComposed> + <nextStep id="select slide transition after showing dock"/> + </reaction> + </step> + <step id="select slide transition after showing dock"> + <text><para>Now, click with the left mouse button on the yellow rectangle to see the transition properties. Note that if you click in the upper part or in the lower part of the yellow rectangle you may select the clips instead; if that happens, just try again to select the yellow rectangle.</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForComposed compositionType="And"> + <waitForEvent receiverName="transitionList" eventName="EnabledChange"/> + <waitForProperty objectName="transitionList" propertyName="enabled" value="true"/> + </waitForComposed> + <nextStep id="change slide transition length"/> + </reaction> + </step> + <step id="change slide transition length"> + <text><para>By default, the second clip slides from the left to the center of the image. You can use the project monitor to see how it looks.</para> + +<para>Suppose that you have seen the transition and found that it was too slow. In that case, you have to reduce the transition length for it to become quicker.</para> + +<para>The easiest way to do this is just moving the second clip so its overlapping with the first clip is reduced. If you do it, as soon as you release the mouse button (not while you are dragging the clip), you will see how the transition is automatically resized to fit with the new position of the clips. You can check again the project monitor after moving the clip to see how it looks now.</para> + +<para>Once you are done changing the transition length we will see how to make changes in the transition itself.</para></text> + <reaction triggerType="OptionSelected" responseType="NextStep"> + <option name="Continue"/> + <nextStep id="edit slide transition start"/> + </reaction> + </step> + <step id="edit slide transition start"> + <text><para>Instead of sliding from left to center we will change the transition to slide from bottom to center.</para> + +<para>The start position of the slide is defined by the button toggled in the <link url="widget:Wipeval_UI/groupBox">start parameters</link> of the <emphasis>slide transition</emphasis>. So, to start from the bottom, just toggle the <link url="widget:start_down">bottom button</link>.</para> + +<para>If you check the project monitor after toggling the bottom button you will see how the transition has changed, sliding as expected from the bottom instead of from the left.</para> + +<para>And that is all. We have seen how to add a <emphasis>slide</emphasis> transition between two clips and how to make some basic changes on that transition.</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForComposed compositionType="And"> + <waitForStepActivation/> + <waitForProperty objectName="transitionList" propertyName="enabled" value="false"/> + </waitForComposed> + <nextStep id="edit slide transition start when transition not selected"/> + </reaction> + </step> + <step id="edit slide transition start when transition not selected"> + <text><para>Instead of sliding from left to center we will change the transition to slide from bottom to center.</para> + +<para>First you have to select the transition again, as it was deselected when moving the clip.</para></text> + <reaction triggerType="ConditionMet" responseType="NextStep"> + <waitForComposed compositionType="And"> + <waitForEvent receiverName="transitionList" eventName="EnabledChange"/> + <waitForProperty objectName="transitionList" propertyName="enabled" value="true"/> + </waitForComposed> + <nextStep id="edit slide transition start after selecting the transition"/> + </reaction> + </step> + <step id="edit slide transition start after selecting the transition"> + <text><para>The start position of the slide is defined by the button toggled in the <link url="widget:Wipeval_UI/groupBox">start parameters</link> of the <emphasis>slide transition</emphasis>. So, to start from the bottom, just toggle the <link url="widget:start_down">bottom button</link>.</para> + +<para>If you check the project monitor after toggling the bottom button you will see how the transition has changed, sliding as expected from the bottom instead of from the left.</para> + +<para>And that is all. We have seen how to add a <emphasis>slide</emphasis> transition between two clips and how to make some basic changes on that transition.</para></text> + </step> +</tutorial> Added: trunk/web-src/data/files/examples/kdenlive.patch =================================================================== --- trunk/web-src/data/files/examples/kdenlive.patch (rev 0) +++ trunk/web-src/data/files/examples/kdenlive.patch 2012-08-30 14:34:37 UTC (rev 383) @@ -0,0 +1,415 @@ +diff --git a/Messages.sh b/Messages.sh +index f69bd55..44a01a4 100755 +--- a/Messages.sh ++++ b/Messages.sh +@@ -5,5 +5,5 @@ kdenlive_subdirs="plugins renderer src src/widgets" + $EXTRACTRC --tag=name --tag=description --tag=label --tag=comment --tag=paramlistdisplay effects/*.xml data/kdenliveeffectscategory.rc >> rc.cpp + $EXTRACTRC `find $kdenlive_subdirs -name \*.rc -a ! -name encodingprofiles.rc -o -name \*.ui` >> rc.cpp + +-$XGETTEXT `find $kdenlive_subdirs -name \*.cpp -o -name \*.h` *.cpp -o $podir/kdenlive.pot ++$XGETTEXT `find $kdenlive_subdirs -name \*.cpp -o -name \*.h` `find data -name \*.js` *.cpp -o $podir/kdenlive.pot + rm -f rc.cpp +diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt +index b593105..47e0c65 100644 +--- a/data/CMakeLists.txt ++++ b/data/CMakeLists.txt +@@ -2,3 +2,5 @@ install(FILES banner.png timeline_nothumbs.png timeline_athumbs.png timeline_vth + install( FILES kdenliveeffectscategory.rc DESTINATION ${CONFIG_INSTALL_DIR} ) + install (FILES kdenlive.xpm DESTINATION share/pixmaps) + install (FILES kdenlive.menu DESTINATION share/menu RENAME kdenlive) ++ ++install(FILES simpleSlideTransitionBetweenTwoClips.js DESTINATION ${DATA_INSTALL_DIR}/kdenlive/tutorials) +diff --git a/data/simpleSlideTransitionBetweenTwoClips.js b/data/simpleSlideTransitionBetweenTwoClips.js +new file mode 100644 +index 0000000..375f877 +--- /dev/null ++++ b/data/simpleSlideTransitionBetweenTwoClips.js +@@ -0,0 +1,310 @@ ++/********************************************************************************************************************************************* ++ * Copyright (C) 2012 by Daniel Calviño Sánchez <dan...@gm...> * ++ * * ++ * This tutorial is licensed under the Creative Commons Attribution-ShareAlike License (http://creativecommons.org/licenses/by-sa/3.0/). * ++ *********************************************************************************************************************************************/ ++ ++t = Kross.module("kdetranslation"); ++ ++tutorial.tutorialInformationAsObject().setName(t.i18n("Simple slide transition between two clips")); ++tutorial.tutorialInformationAsObject().setDescription(t.i18n("Basic usage of \"slide\" transition.")); ++ ++//Step start ++startStep = ktutorial.newStep("start"); ++startStep.setText(t.i18nc("@info", "<para>In this tutorial you will learn how to add a <emphasis>slide</emphasis> transition between two clips and how to do some basic changes in the transition.</para>\n\n<para>For this tutorial you will need a project with at least two video tracks in the <link url=\"widget:TimeLine_UI\">timeline</link>, and you will need too two clips.</para>\n\n<para>Do you want to use your own clips, or do you want to add two example clips just for this tutorial?</para>")); ++ ++function startStepSetup(step) { ++ iWillUseMyOwnClipsOption = ktutorial.newOption(t.i18nc("@action Tutorial option", "I will use my own clips")); ++ step.addOption(iWillUseMyOwnClipsOption, "add clips to timeline"); ++ ++ letSAddTheExampleClipsOption = ktutorial.newOption(t.i18nc("@action Tutorial option", "Let's add the example clips")); ++ step.addOption(letSAddTheExampleClipsOption, "add the first color clip"); ++} ++connect(startStep, "setup(QObject*)", ++ this, "startStepSetup(QObject*)"); ++ ++tutorial.addStep(startStep); ++ ++//Step add the first color clip ++addTheFirstColorClipStep = ktutorial.newStep("add the first color clip"); ++addTheFirstColorClipStep.setText(t.i18nc("@info", "<para>First, we will add a new color clip.</para>\n\n<para>To do this there are several options:\n<list>\n<item>In the menu bar, you can select <interface>Project|Add color clip</interface>.</item>\n\n<item>In the <link url=\"widget:project_tree\">project tree</link>, you can click with the right mouse button on the clip list and then select <interface>Add color clip</interface>.</item>\n\n<item>In the project tree, you can click with the left mouse button on the arrow near to the <interface>Add clip</interface> button (its icon is a film with a <emphasis>+</emphasis> sign), and then select <interface>Add color clip</interface>.</item>\n</list>\n</para>")); ++ ++function addTheFirstColorClipStepSetup(step) { ++ waitForColorClip_UIToBeShown = ktutorial.newWaitFor("WaitForWindow"); ++ waitForColorClip_UIToBeShown.setWindowObjectName("ColorClip_UI"); ++ step.addWaitFor(waitForColorClip_UIToBeShown, "set name for first color clip"); ++} ++connect(addTheFirstColorClipStep, "setup(QObject*)", ++ this, "addTheFirstColorClipStepSetup(QObject*)"); ++ ++tutorial.addStep(addTheFirstColorClipStep); ++ ++//Step set name for first color clip ++setNameForFirstColorClipStep = ktutorial.newStep("set name for first color clip"); ++setNameForFirstColorClipStep.setText(t.i18nc("@info", "<para>In the dialog that has just been opened, change the <link url=\"widget:clip_name\">clip name</link> to <emphasis>First clip</emphasis>.</para>")); ++ ++function setNameForFirstColorClipStepSetup(step) { ++ waitForTextInClip_name = ktutorial.newWaitFor("WaitForProperty"); ++ waitForTextInClip_name.setProperty(ktutorial.findObject("clip_name"), "text", t.i18n("First clip")); ++ step.addWaitFor(waitForTextInClip_name, "set color for first color clip"); ++} ++connect(setNameForFirstColorClipStep, "setup(QObject*)", ++ this, "setNameForFirstColorClipStepSetup(QObject*)"); ++ ++tutorial.addStep(setNameForFirstColorClipStep); ++ ++//Step set color for first color clip ++setColorForFirstColorClipStep = ktutorial.newStep("set color for first color clip"); ++setColorForFirstColorClipStep.setText(t.i18nc("@info", "<para>Change the <link url=\"widget:clip_color\">color</link> to black.</para>")); ++ ++function setColorForFirstColorClipStepSetup(step) { ++ waitForStepActivation = ktutorial.newWaitFor("WaitForStepActivation"); ++ waitForStepActivation.setStep(tutorial, step); ++ ++ waitForColorInClip_color = ktutorial.newWaitFor("WaitForProperty"); ++ waitForColorInClip_color.setProperty(ktutorial.findObject("clip_color"), "color", "#000000"); ++ ++ waitForAnd = ktutorial.newWaitFor("WaitForAnd"); ++ waitForAnd.add(waitForStepActivation); ++ waitForAnd.add(waitForColorInClip_color); ++ step.addWaitFor(waitForAnd, "set duration for first color clip"); ++ ++ waitForColorInClip_color2 = ktutorial.newWaitFor("WaitForProperty"); ++ waitForColorInClip_color2.setProperty(ktutorial.findObject("clip_color"), "color", "#000000"); ++ step.addWaitFor(waitForColorInClip_color2, "set duration for first color clip"); ++} ++connect(setColorForFirstColorClipStep, "setup(QObject*)", ++ this, "setColorForFirstColorClipStepSetup(QObject*)"); ++ ++tutorial.addStep(setColorForFirstColorClipStep); ++ ++//Step set duration for first color clip ++setDurationForFirstColorClipStep = ktutorial.newStep("set duration for first color clip"); ++setDurationForFirstColorClipStep.setText(t.i18nc("@info/plain", "Set the clip duration to something around 4 or 5 seconds and then accept the dialog.")); ++ ++function setDurationForFirstColorClipStepSetup(step) { ++ waitForAcceptedByColorClip_UI = ktutorial.newWaitFor("WaitForSignal"); ++ waitForAcceptedByColorClip_UI.setSignal(ktutorial.findObject("ColorClip_UI"), "accepted()"); ++ step.addWaitFor(waitForAcceptedByColorClip_UI, "add the second color clip"); ++} ++connect(setDurationForFirstColorClipStep, "setup(QObject*)", ++ this, "setDurationForFirstColorClipStepSetup(QObject*)"); ++ ++tutorial.addStep(setDurationForFirstColorClipStep); ++ ++//Step add the second color clip ++addTheSecondColorClipStep = ktutorial.newStep("add the second color clip"); ++addTheSecondColorClipStep.setText(t.i18nc("@info", "<para>Now add another new color clip.</para>")); ++ ++function addTheSecondColorClipStepSetup(step) { ++ waitForColorClip_UIToBeShown = ktutorial.newWaitFor("WaitForWindow"); ++ waitForColorClip_UIToBeShown.setWindowObjectName("ColorClip_UI"); ++ step.addWaitFor(waitForColorClip_UIToBeShown, "set name for second color clip"); ++} ++connect(addTheSecondColorClipStep, "setup(QObject*)", ++ this, "addTheSecondColorClipStepSetup(QObject*)"); ++ ++tutorial.addStep(addTheSecondColorClipStep); ++ ++//Step set name for second color clip ++setNameForSecondColorClipStep = ktutorial.newStep("set name for second color clip"); ++setNameForSecondColorClipStep.setText(t.i18nc("@info", "<para>Change the <link url=\"widget:clip_name\">clip name</link> to <emphasis>Second clip</emphasis>.</para>")); ++ ++function setNameForSecondColorClipStepSetup(step) { ++ waitForTextInClip_name = ktutorial.newWaitFor("WaitForProperty"); ++ waitForTextInClip_name.setProperty(ktutorial.findObject("clip_name"), "text", t.i18n("Second clip")); ++ step.addWaitFor(waitForTextInClip_name, "set color for second color clip"); ++} ++connect(setNameForSecondColorClipStep, "setup(QObject*)", ++ this, "setNameForSecondColorClipStepSetup(QObject*)"); ++ ++tutorial.addStep(setNameForSecondColorClipStep); ++ ++//Step set color for second color clip ++setColorForSecondColorClipStep = ktutorial.newStep("set color for second color clip"); ++setColorForSecondColorClipStep.setText(t.i18nc("@info", "<para>Change the <link url=\"widget:clip_color\">color</link> to white.</para>")); ++ ++function setColorForSecondColorClipStepSetup(step) { ++ waitForStepActivation = ktutorial.newWaitFor("WaitForStepActivation"); ++ waitForStepActivation.setStep(tutorial, step); ++ ++ waitForColorInClip_color = ktutorial.newWaitFor("WaitForProperty"); ++ waitForColorInClip_color.setProperty(ktutorial.findObject("clip_color"), "color", "#FFFFFF"); ++ ++ waitForAnd = ktutorial.newWaitFor("WaitForAnd"); ++ waitForAnd.add(waitForStepActivation); ++ waitForAnd.add(waitForColorInClip_color); ++ step.addWaitFor(waitForAnd, "set duration for second color clip"); ++ ++ waitForColorInClip_color2 = ktutorial.newWaitFor("WaitForProperty"); ++ waitForColorInClip_color2.setProperty(ktutorial.findObject("clip_color"), "color", "#FFFFFF"); ++ step.addWaitFor(waitForColorInClip_color2, "set duration for second color clip"); ++} ++connect(setColorForSecondColorClipStep, "setup(QObject*)", ++ this, "setColorForSecondColorClipStepSetup(QObject*)"); ++ ++tutorial.addStep(setColorForSecondColorClipStep); ++ ++//Step set duration for second color clip ++setDurationForSecondColorClipStep = ktutorial.newStep("set duration for second color clip"); ++setDurationForSecondColorClipStep.setText(t.i18nc("@info/plain", "Set the clip duration to something around 4 or 5 seconds and then accept the dialog.")); ++ ++function setDurationForSecondColorClipStepSetup(step) { ++ waitForAcceptedByColorClip_UI = ktutorial.newWaitFor("WaitForSignal"); ++ waitForAcceptedByColorClip_UI.setSignal(ktutorial.findObject("ColorClip_UI"), "accepted()"); ++ step.addWaitFor(waitForAcceptedByColorClip_UI, "add clips to timeline"); ++} ++connect(setDurationForSecondColorClipStep, "setup(QObject*)", ++ this, "setDurationForSecondColorClipStepSetup(QObject*)"); ++ ++tutorial.addStep(setDurationForSecondColorClipStep); ++ ++//Step add clips to timeline ++addClipsToTimelineStep = ktutorial.newStep("add clips to timeline"); ++addClipsToTimelineStep.setText(t.i18nc("@info", "<para>Add the first clip to a video track in the <link url=\"widget:tracks_frame\">timeline</link>. The track must have at least another video track below it.</para>\n\n<para>Then add the second clip to the track below the track of the first clip. Make sure that the two clips overlap by one or two seconds.</para>\n\n<para>Now it is time to add the <emphasis>slide</emphasis> transition. Look at the first clip in the timeline. One of its lower corners overlaps the second clip. Put the cursor on that corner, and an arrow will appear on it. Then, click with the right button of the mouse and, in the menu that pops up, select <interface>Add transition|Slide</interface>.</para>")); ++ ++function addClipsToTimelineStepSetup(step) { ++ waitForActivatedByTransition_slide = ktutorial.newWaitFor("WaitForSignal"); ++ waitForActivatedByTransition_slide.setSignal(ktutorial.findObject("transition_slide"), "activated()"); ++ step.addWaitFor(waitForActivatedByTransition_slide, "select slide transition"); ++} ++connect(addClipsToTimelineStep, "setup(QObject*)", ++ this, "addClipsToTimelineStepSetup(QObject*)"); ++ ++tutorial.addStep(addClipsToTimelineStep); ++ ++//Step select slide transition ++selectSlideTransitionStep = ktutorial.newStep("select slide transition"); ++selectSlideTransitionStep.setText(t.i18nc("@info", "<para>A <emphasis>slide</emphasis> transition has been added between the first and the second clip. You can see it by the yellow rectangle placed between the clips, in the area they overlap.</para>\n\n<para>Click with the left mouse button on that yellow rectangle to see the transition properties. Note that if you click in the upper part or in the lower part of the yellow rectangle you may select the clips instead; if that happens, just try again to select the yellow rectangle.</para>")); ++ ++function selectSlideTransitionStepSetup(step) { ++ waitForStepActivation = ktutorial.newWaitFor("WaitForStepActivation"); ++ waitForStepActivation.setStep(tutorial, step); ++ ++ waitForVisibleInTransition = ktutorial.newWaitFor("WaitForProperty"); ++ waitFo... [truncated message content] |
From: <dan...@us...> - 2012-08-24 16:43:25
|
Revision: 382 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=382&view=rev Author: danxuliu Date: 2012-08-24 16:43:14 +0000 (Fri, 24 Aug 2012) Log Message: ----------- Update pages for 0.5 release. Modified Paths: -------------- trunk/web-src/newsList.xml trunk/web-src/pages/about.xml trunk/web-src/pages/development.xml trunk/web-src/pages/download.xml trunk/web-src/pages/faq.xml trunk/web-src/pages/index.xml trunk/web-src/pages/news.xml Modified: trunk/web-src/newsList.xml =================================================================== --- trunk/web-src/newsList.xml 2012-08-21 20:06:54 UTC (rev 381) +++ trunk/web-src/newsList.xml 2012-08-24 16:43:14 UTC (rev 382) @@ -52,4 +52,18 @@ <date>2010-10-30</date> </fullDate> </new> + + <new> + <title>KTutorial 0.5 released!</title> + <summary> + <div xmlns="http://www.w3.org/1999/xhtml"> + <p>The focus on this release was on getting KTutorial ready to be used by other applications besides the KTutorial editor itself.</p> + <p>The <a href="http://sourceforge.net/projects/ktutorial/files/ktutorial-0.5/README/view" title="KTutorial 0.5 release notes">release notes</a> contain more information about the changes from 0.4 release.</p> + <p>Check the <a href="download.html" title="Download page in KTutorial web">download page</a> for information about downloading and building KTutorial.</p> + </div> + </summary> + <fullDate> + <date>2012-08-21</date> + </fullDate> + </new> </news> Modified: trunk/web-src/pages/about.xml =================================================================== --- trunk/web-src/pages/about.xml 2012-08-21 20:06:54 UTC (rev 381) +++ trunk/web-src/pages/about.xml 2012-08-24 16:43:14 UTC (rev 382) @@ -17,16 +17,16 @@ <div class="h2Rounded"> <h2><a id="project" class="anchorLink">Project overview</a></h2> </div> - <p>KTutorial is a library for interactive tutorials in KDE applications. Tutorials are embeded in the application itself, and reacts to user actions: waits for some task to be accomplished, warns if something wasn't done as it should, etcetera. As the tutorial is being followed, the system gives feedback to the user.</p> + <p>KTutorial is a library (and a graphical editor) for interactive tutorials in KDE applications. Tutorials are embeded in the application itself, and react to user actions: wait for some task to be accomplished, warn if something wasn't done as it should, etcetera. As the tutorial is being followed, the system gives feedback to the user.</p> <p>It is licensed under the <a href="http://www.gnu.org/copyleft/gpl.html" title="GNU General Public License page">GNU GPL license</a>. It is also free as in "free beer".</p> <div class="h2Rounded"> <h2><a id="author" class="anchorLink">Author</a></h2> </div> <p>KTutorial was initially developed by me, Daniel Calviño Sánchez, as my entry in the <a href="http://www.concursosoftwarelibre.org/" title="II Concurso Universitario de Software Libre web page">II Concurso Universitario de Software Libre</a> (second universitary free software contest). It didn't make its way to the final phase, although it received a <a href="http://www.concursosoftwarelibre.org/0708/node/157.html" title="Premios del II Concurso Universitario de Software Libre">Special Mention</a> :)</p> - <p>Now it is being developed as my final project in Computer Engineering at <a href="http://www.epsig.uniovi.es" title="E.P.S.I.G. webpage">Escuela Politécnica Superior de Ingeniería de Gijón</a>.</p> - <p>If you want, you can contact me using this e-mail address: danxuliu at gmail.com. Please, begin the subject with "KTutorial:" (without quotes) or something like that. It will help me to keep my inbox organized :) Thanks ;)</p> - <p>Please note that I can understand only Spanish, Asturian and English, so if you send me a message in other language I won't be able to understand it ;)</p> + <p>Then I developed it further and defended it as my final project in Computer Engineering at Escuela Politécnica Superior de Ingeniería de Gijón.</p> + <p>If you want, you can contact me using this e-mail address: danxuliu at gmail.com.</p> + <p>And please note that I may not be able to understand your message if it is not written in Spanish, Asturian or English ;)</p> <div class="h2Rounded"> <h2><a id="web" class="anchorLink">About this web</a></h2> @@ -34,6 +34,6 @@ <p>The web is divided in several sections that can be accessed through the links in the menu in each page. I'm not going to explain its structure, as it seems very clear and I have better things to spend my time on :P</p> <p>You can find information about how this web is built in its own page: <a href="aboutWeb.html" title="About KTutorial project web building">About web</a>.</p> - <p class="lastUpdated">Last updated: 2010-01-30</p> + <p class="lastUpdated">Last updated: 2012-08-21</p> </page:content> </page> Modified: trunk/web-src/pages/development.xml =================================================================== --- trunk/web-src/pages/development.xml 2012-08-21 20:06:54 UTC (rev 381) +++ trunk/web-src/pages/development.xml 2012-08-24 16:43:14 UTC (rev 382) @@ -23,7 +23,7 @@ <h2><a id="documentation" class="anchorLink">Documentation</a></h2> </div> <p>This documentation is about KTutorial development. If you are a developer, but are looking for documentation about using KTutorial in your application, take a look in <a href="documentation.html#developers" title="Documentation for developers using KTutorial">developers section</a> in the documentation page.</p> - <p>Instead, if you are curious about how KTutorial is developed (design, implementation...), take a look in <a href="doc/design.html" title="KTutorial design document">KTutorial design</a>. However, I still need to work on it, as it is more a draft than a final document, and it is also painfully outdated...</p> + <p>Instead, if you are curious about how KTutorial is designed, take a look in <a href="doc/design.html" title="KTutorial design document">KTutorial design</a>. Although it is painfully outdated, most is still valid. However, several components are missing from the explanation.</p> <p>The UML diagrams (mostly class diagrams), on the other hand, are up to date: <a href="doc/Editor.xmi" title="KTutorial Editor UML diagrams">editor</a> and <a href="doc/Library.xmi" title="KTutorial Library UML diagrams">library</a>. Both files can be opened using <a href="http://uml.sourceforge.net/" title="Umbrello UML Modeller home page">Umbrello UML Modeller</a>.</p> <div class="h2Rounded"> @@ -55,6 +55,9 @@ <p><em>Easy integration:</em> KTutorial was designed to ease its use in applications, so the developer only has to worry about coding the tutorial. Setting KTutorial up, merging the menus, managing the tutorials and things like that are done almost automatically.</p> </li> <li> + <p><em>Optional customization:</em> KTutorial also offers the possibility to developers to provide their own user interface instead of using the default one.</p> + </li> + <li> <p><em>Internationalization:</em> KTutorial, as a good KDE library, uses KDE internationalization system, so it can be localized in several languages. Right now, only English and Spanish localizations are supported.</p> </li> <li> @@ -74,9 +77,9 @@ <p>Here you can see what (major) features I expect to include in the future.</p> <ul class="foldableList"> <li> - 0.5: + 0.6: <ul> - <li>Add support for custom conditions in KTutorial editor.</li> + <li>Improve KTutorial editor for non-technical users.</li> </ul> </li> <li> @@ -88,6 +91,6 @@ </li> </ul> - <p class="lastUpdated">Last updated: 2010-10-30</p> + <p class="lastUpdated">Last updated: 2012-08-21</p> </page:content> </page> Modified: trunk/web-src/pages/download.xml =================================================================== --- trunk/web-src/pages/download.xml 2012-08-21 20:06:54 UTC (rev 381) +++ trunk/web-src/pages/download.xml 2012-08-24 16:43:14 UTC (rev 382) @@ -17,8 +17,8 @@ <div class="h2Rounded"> <h2><a id="releases" class="anchorLink">Releases</a></h2> </div> - <p>Current release is 0.4. You can download <a href="http://sourceforge.net/projects/ktutorial/files/ktutorial-0.4/ktutorial-0.4.tar.gz/download" title="KTutorial 0.4 release in tar.gz">ktutorial-0.4.tar.gz</a> from <a href="http://sourceforge.net/projects/ktutorial/files/" title="KTutorial project files">project's file list</a>.</p> - <p>You can also see the <a href="http://sourceforge.net/projects/ktutorial/files/ktutorial-0.4/Release%20notes/view" title="KTutorial 0.4 release notes">release notes</a> (although there isn't much to see ;) ).</p> + <p>Current release is 0.5. You can download <a href="http://sourceforge.net/projects/ktutorial/files/ktutorial-0.5/ktutorial-0.5.tar.gz/download" title="KTutorial 0.5 release in tar.gz">ktutorial-0.5.tar.gz</a> from <a href="http://sourceforge.net/projects/ktutorial/files/" title="KTutorial project files">project's file list</a>.</p> + <p>You can also see the <a href="http://sourceforge.net/projects/ktutorial/files/ktutorial-0.5/README/view" title="KTutorial 0.5 release notes">release notes</a>, which list the changes from the previous release.</p> <p>See below for build instructions, in <a href="#build" title="Build instructions">building section</a>.</p> <p>If you do know what you are doing ;) , you can also checkout KTutorial sources from <acronym title="Subversion">SVN</acronym> repository. Go on reading to know how to do it.</p> @@ -39,8 +39,8 @@ <p>In order to build KTutorial, it doesn't matter if you downloaded it from a release or from <acronym title="Subversion">SVN</acronym>.</p> <p>You will need <a href="http://www.cmake.org" title="CMake project web">CMake</a>, and Qt >= 4.6 and KDE 4 kdelibs development packages installed in your system. It can be built like any other KDE 4 library or application.</p> <p>Create a <em>build</em> subdirectory in <em>ktutorial</em> directory, and change to it. Now, in a terminal, just run <strong>cmake ../ && make</strong> and it will configure and build KTutorial in the <em>build</em> directory. Once built, execute <strong>make install</strong> and you are done (you will likely need to change to root user, as default KDE installation is usually only root writable).</p> - <p>If you want to specify a prefix to install KTutorial to, instead of using KDE default installation directory, call CMake using the parameter <strong>-DCMAKE_INSTALL_PREFIX=/installation/prefix</strong>. For debugging purposes, use <strong>-DCMAKE_BUILD_TYPE=debugfull</strong>. To automatically build the unit tests when the library is built, use <strong>-DKDE4_BUILD_TESTS=ON</strong>.</p> + <p>If you want to specify a prefix to install KTutorial to, instead of using KDE default installation directory, call CMake using the parameter <strong>-DCMAKE_INSTALL_PREFIX=/installation/prefix</strong>. For debugging purposes, use <strong>-DCMAKE_BUILD_TYPE=debugfull</strong>. To automatically build the unit tests when the project is built, use <strong>-DKDE4_BUILD_TESTS=ON</strong>.</p> - <p class="lastUpdated">Last updated: 2010-10-30</p> + <p class="lastUpdated">Last updated: 2012-08-21</p> </page:content> </page> Modified: trunk/web-src/pages/faq.xml =================================================================== --- trunk/web-src/pages/faq.xml 2012-08-21 20:06:54 UTC (rev 381) +++ trunk/web-src/pages/faq.xml 2012-08-24 16:43:14 UTC (rev 382) @@ -31,7 +31,7 @@ <div class="QandAentry"> <h3 class="question"><a id="whyGPL" class="anchorLink">Why did you choose <acronym title="GNU General Public License">GPL</acronym> license being a library?</a></h3> <div class="answer"> - <p>Why not? Oh, wait, do you mean why I didn't choose the <a href="" title="GNU Lesser General Public License"><acronym title="Lesser General Public License">LGPL</acronym></a> instead? Well, because I prefer its "even if you're only linking against GPL code without modifying it the code where it's being used must be GPL" viral property. Anyway, if you need a special license for KTutorial, <a href="about.html#author" title="About the author">contact me</a>. Maybe you can convince me ;)</p> + <p>Why not? Oh, wait, do you mean why I didn't choose the <a href="http://www.gnu.org/copyleft/lgpl.html" title="GNU Lesser General Public License"><acronym title="Lesser General Public License">LGPL</acronym></a> instead? Well, because I prefer its "even if you're only linking against GPL code without modifying it the code where it's being used must be GPL" viral property. Anyway, if you need a special license for KTutorial, <a href="about.html#author" title="About the author">contact me</a>. Maybe you can convince me ;)</p> </div> </div> <div class="QandAentry"> Modified: trunk/web-src/pages/index.xml =================================================================== --- trunk/web-src/pages/index.xml 2012-08-21 20:06:54 UTC (rev 381) +++ trunk/web-src/pages/index.xml 2012-08-24 16:43:14 UTC (rev 382) @@ -26,6 +26,21 @@ <div id="news"> <div class="new"> <h2 class="newTitle"> + <a id="newId5" class="anchorLink">KTutorial 0.5 released!</a> + </h2> + <div class="newBody"> + <p class="newDate">2012-08-21</p> + <div class="newContent"> + <div> + <p>The focus on this release was on getting KTutorial ready to be used by other applications besides the KTutorial editor itself.</p> + <p>The <a href="http://sourceforge.net/projects/ktutorial/files/ktutorial-0.5/README/view" title="KTutorial 0.5 release notes">release notes</a> contain more information about the changes from 0.4 release.</p> + <p>Check the <a href="download.html" title="Download page in KTutorial web">download page</a> for information about downloading and building KTutorial.</p> + </div> + </div> + </div> + </div> + <div class="new"> + <h2 class="newTitle"> <a id="newId4" class="anchorLink">KTutorial 0.4 released!</a> </h2> <div class="newBody"> Modified: trunk/web-src/pages/news.xml =================================================================== --- trunk/web-src/pages/news.xml 2012-08-21 20:06:54 UTC (rev 381) +++ trunk/web-src/pages/news.xml 2012-08-24 16:43:14 UTC (rev 382) @@ -23,6 +23,21 @@ <div id="news"> <div class="new"> <h2 class="newTitle"> + <a id="newId5" class="anchorLink">KTutorial 0.5 released!</a> + </h2> + <div class="newBody"> + <p class="newDate">2012-08-21</p> + <div class="newContent"> + <div> + <p>The focus on this release was on getting KTutorial ready to be used by other applications besides the KTutorial editor itself.</p> + <p>The <a href="http://sourceforge.net/projects/ktutorial/files/ktutorial-0.5/README/view" title="KTutorial 0.5 release notes">release notes</a> contain more information about the changes from 0.4 release.</p> + <p>Check the <a href="download.html" title="Download page in KTutorial web">download page</a> for information about downloading and building KTutorial.</p> + </div> + </div> + </div> + </div> + <div class="new"> + <h2 class="newTitle"> <a id="newId4" class="anchorLink">KTutorial 0.4 released!</a> </h2> <div class="newBody"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-08-21 20:07:05
|
Revision: 381 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=381&view=rev Author: danxuliu Date: 2012-08-21 20:06:54 +0000 (Tue, 21 Aug 2012) Log Message: ----------- 0.5 release tagged Added Paths: ----------- tags/ktutorial-0.5/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-08-21 20:02:28
|
Revision: 380 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=380&view=rev Author: danxuliu Date: 2012-08-21 20:02:22 +0000 (Tue, 21 Aug 2012) Log Message: ----------- Bump version to 0.5. Modified Paths: -------------- trunk/ktutorial/ktutorial-editor/src/main.cpp trunk/ktutorial/ktutorial-library/CMakeLists.txt Modified: trunk/ktutorial/ktutorial-editor/src/main.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/main.cpp 2012-08-20 12:29:53 UTC (rev 379) +++ trunk/ktutorial/ktutorial-editor/src/main.cpp 2012-08-21 20:02:22 UTC (rev 380) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -25,11 +25,11 @@ int main (int argc, char *argv[]) { KAboutData aboutData("ktutorial-editor", 0, ki18nc("@title", "KTutorial editor"), - "0.1", + "0.5", ki18nc("@title", "An editor to create tutorials for " "<application>KTutorial</application>."), KAboutData::License_GPL_V3, - ki18nc("@info:credit", "Copyright (c) 2010 Daniel Calviño Sánchez")); + ki18nc("@info:credit", "Copyright (c) 2010-2012 Daniel Calviño Sánchez")); aboutData.addAuthor(ki18nc("@info:credit", "Daniel Calviño Sánchez"), ki18nc("@info:credit", "Main developer"), "dan...@gm..."); Modified: trunk/ktutorial/ktutorial-library/CMakeLists.txt =================================================================== --- trunk/ktutorial/ktutorial-library/CMakeLists.txt 2012-08-20 12:29:53 UTC (rev 379) +++ trunk/ktutorial/ktutorial-library/CMakeLists.txt 2012-08-21 20:02:22 UTC (rev 380) @@ -5,8 +5,8 @@ ####### KTutorial version ####### set(CMAKE_KTUTORIAL_VERSION_MAJOR 0) -set(CMAKE_KTUTORIAL_VERSION_MINOR 4) -set(CMAKE_KTUTORIAL_VERSION_RELEASE 98) +set(CMAKE_KTUTORIAL_VERSION_MINOR 5) +set(CMAKE_KTUTORIAL_VERSION_RELEASE 0) set(CMAKE_KTUTORIAL_VERSION_STRING "${CMAKE_KTUTORIAL_VERSION_MAJOR}.${CMAKE_KTUTORIAL_VERSION_MINOR}.${CMAKE_KTUTORIAL_VERSION_RELEASE}") enable_testing() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-08-20 12:30:03
|
Revision: 379 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=379&view=rev Author: danxuliu Date: 2012-08-20 12:29:53 +0000 (Mon, 20 Aug 2012) Log Message: ----------- Fix Krazy2 doublequote_chars issues. Modified Paths: -------------- trunk/ktutorial/ktutorial-library/tests/view/WindowOnTopEnforcerTest.cpp Modified: trunk/ktutorial/ktutorial-library/tests/view/WindowOnTopEnforcerTest.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/tests/view/WindowOnTopEnforcerTest.cpp 2012-08-20 12:29:17 UTC (rev 378) +++ trunk/ktutorial/ktutorial-library/tests/view/WindowOnTopEnforcerTest.cpp 2012-08-20 12:29:53 UTC (rev 379) @@ -987,7 +987,7 @@ QWidget* expectedParent) const { QVERIFY(window); QString message = "\nActual: " + window->parentWidget()->windowTitle() + - "\nExpected: " + expectedParent->windowTitle() + "\n"; + "\nExpected: " + expectedParent->windowTitle() + '\n'; QVERIFY2(window->parentWidget() == expectedParent, message.toStdString().c_str()); QVERIFY(window->isVisible()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-08-20 12:29:23
|
Revision: 378 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=378&view=rev Author: danxuliu Date: 2012-08-20 12:29:17 +0000 (Mon, 20 Aug 2012) Log Message: ----------- Fix Krazy2 emptystrcompare issues. Modified Paths: -------------- trunk/ktutorial/ktutorial-library/src/ObjectFinder.cpp Modified: trunk/ktutorial/ktutorial-library/src/ObjectFinder.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/ObjectFinder.cpp 2012-08-20 12:27:48 UTC (rev 377) +++ trunk/ktutorial/ktutorial-library/src/ObjectFinder.cpp 2012-08-20 12:29:17 UTC (rev 378) @@ -92,7 +92,7 @@ int unnamedAncestorCount = 0; while (objectPath.size() > unnamedAncestorCount && - objectPath[unnamedAncestorCount]->objectName() == "") { + objectPath[unnamedAncestorCount]->objectName().isEmpty()) { unnamedAncestorCount++; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-08-20 12:27:59
|
Revision: 377 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=377&view=rev Author: danxuliu Date: 2012-08-20 12:27:48 +0000 (Mon, 20 Aug 2012) Log Message: ----------- Fix Krazy2 spelling issues. Modified Paths: -------------- trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectNameWidgetTest.cpp trunk/ktutorial/ktutorial-library/src/KTutorial.h Modified: trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectNameWidgetTest.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectNameWidgetTest.cpp 2012-08-20 12:24:59 UTC (rev 376) +++ trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectNameWidgetTest.cpp 2012-08-20 12:27:48 UTC (rev 377) @@ -559,7 +559,7 @@ KLineEdit* lineEdit = objectNameLineEdit(&widget); //Using the configured KShortcut with QTest::keyClick is too cumbersome, - //so the binding is overriden for this test + //so the binding is overridden for this test lineEdit->setKeyBinding(KCompletionBase::SubstringCompletion, KShortcut("Ctrl+T")); QTest::keyClick(lineEdit, Qt::Key_T, Qt::ControlModifier); Modified: trunk/ktutorial/ktutorial-library/src/KTutorial.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/KTutorial.h 2012-08-20 12:24:59 UTC (rev 376) +++ trunk/ktutorial/ktutorial-library/src/KTutorial.h 2012-08-20 12:27:48 UTC (rev 377) @@ -155,7 +155,7 @@ * called "Ancestor name not unique", there is only one that has a * descendant called "The object to find". * - * In some cases it may be posible that a unique name can not be provided, + * In some cases it may be possible that a unique name can not be provided, * even using ancestor names. In those cases there are some rules to resolve * the ambiguity. Between two or more objects with the same name, the * selected one is: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-08-20 12:25:08
|
Revision: 376 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=376&view=rev Author: danxuliu Date: 2012-08-20 12:24:59 +0000 (Mon, 20 Aug 2012) Log Message: ----------- Fix Krazy2 foreach issues. Modified Paths: -------------- trunk/ktutorial/ktutorial-editor/src/view/StepDataWidget.cpp Modified: trunk/ktutorial/ktutorial-editor/src/view/StepDataWidget.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/view/StepDataWidget.cpp 2012-08-20 12:23:38 UTC (rev 375) +++ trunk/ktutorial/ktutorial-editor/src/view/StepDataWidget.cpp 2012-08-20 12:24:59 UTC (rev 376) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2011 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -77,7 +77,7 @@ QStringList unusedStepIds; - foreach (QString nextStepId, nextStepIds) { + foreach (const QString& nextStepId, nextStepIds) { if (!usedStepIds.contains(nextStepId)) { unusedStepIds.append(nextStepId); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-08-20 12:23:45
|
Revision: 375 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=375&view=rev Author: danxuliu Date: 2012-08-20 12:23:38 +0000 (Mon, 20 Aug 2012) Log Message: ----------- Fix Krazy2 normalize issues. Modified Paths: -------------- trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteEventSpy.cpp trunk/ktutorial/ktutorial-editor/src/targetapplication/TargetApplication.cpp trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeSelectionManager.cpp trunk/ktutorial/ktutorial-editor/src/view/TutorialTreeSelectionManager.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForWidget.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/TreeModelTest.cpp trunk/ktutorial/ktutorial-library/src/view/TutorialManagerDialog.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/EditorSupportTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/EventSpyAdaptorTest.cpp Modified: trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteEventSpy.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteEventSpy.cpp 2012-08-20 11:16:43 UTC (rev 374) +++ trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteEventSpy.cpp 2012-08-20 12:23:38 UTC (rev 375) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -34,8 +34,8 @@ QDBusInterface* interface = new QDBusInterface( service, "/ktutorial/EventSpy", "org.kde.ktutorial.EventSpy", QDBusConnection::sessionBus(), this); - connect(interface, SIGNAL(eventReceived(int, QString)), - this, SLOT(handleEventReceived(int, QString))); + connect(interface, SIGNAL(eventReceived(int,QString)), + this, SLOT(handleEventReceived(int,QString))); } //private: Modified: trunk/ktutorial/ktutorial-editor/src/targetapplication/TargetApplication.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/targetapplication/TargetApplication.cpp 2012-08-20 11:16:43 UTC (rev 374) +++ trunk/ktutorial/ktutorial-editor/src/targetapplication/TargetApplication.cpp 2012-08-20 12:23:38 UTC (rev 375) @@ -86,7 +86,7 @@ QDBusConnection::sessionBus().interface(); connect(interface, SIGNAL(serviceRegistered(QString)), this, SLOT(checkNewService(QString))); - connect(interface, SIGNAL(serviceOwnerChanged(QString, QString, QString)), + connect(interface, SIGNAL(serviceOwnerChanged(QString,QString,QString)), this, SLOT(checkNewService(QString))); connect(mProcess, SIGNAL(error(QProcess::ProcessError)), Modified: trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeSelectionManager.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeSelectionManager.cpp 2012-08-20 11:16:43 UTC (rev 374) +++ trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeSelectionManager.cpp 2012-08-20 12:23:38 UTC (rev 375) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2011 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -28,9 +28,9 @@ QItemSelectionModel* itemSelectionModel, QObject* parent): QObject(parent) { connect(itemSelectionModel, - SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, - SLOT(handleSelectionChanged(QItemSelection, QItemSelection))); + SLOT(handleSelectionChanged(QItemSelection,QItemSelection))); } //private: Modified: trunk/ktutorial/ktutorial-editor/src/view/TutorialTreeSelectionManager.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/view/TutorialTreeSelectionManager.cpp 2012-08-20 11:16:43 UTC (rev 374) +++ trunk/ktutorial/ktutorial-editor/src/view/TutorialTreeSelectionManager.cpp 2012-08-20 12:23:38 UTC (rev 375) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -28,9 +28,9 @@ QItemSelectionModel* itemSelectionModel, QObject* parent): QObject(parent) { connect(itemSelectionModel, - SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, - SLOT(handleSelectionChanged(QItemSelection, QItemSelection))); + SLOT(handleSelectionChanged(QItemSelection,QItemSelection))); } //private: Modified: trunk/ktutorial/ktutorial-editor/src/view/WaitForWidget.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/view/WaitForWidget.cpp 2012-08-20 11:16:43 UTC (rev 374) +++ trunk/ktutorial/ktutorial-editor/src/view/WaitForWidget.cpp 2012-08-20 12:23:38 UTC (rev 375) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2011 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -87,9 +87,9 @@ delete oldModel; connect(treeView->selectionModel(), - SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, - SLOT(handleSelectionChanged(QItemSelection, QItemSelection))); + SLOT(handleSelectionChanged(QItemSelection,QItemSelection))); } void WaitForWidget::updateWaitForSelection(WaitFor* selectedWaitFor) { Modified: trunk/ktutorial/ktutorial-editor/tests/unit/view/TreeModelTest.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/tests/unit/view/TreeModelTest.cpp 2012-08-20 11:16:43 UTC (rev 374) +++ trunk/ktutorial/ktutorial-editor/tests/unit/view/TreeModelTest.cpp 2012-08-20 12:23:38 UTC (rev 375) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -244,8 +244,8 @@ TreeModel model(rootItem); QSignalSpy aboutToSpy(&model, - SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int))); - QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex, int, int))); + SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int))); + QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex,int,int))); rootItem->appendChild(new StubTreeItem("root-1", rootItem)); @@ -273,8 +273,8 @@ TreeModel model(rootItem); QSignalSpy aboutToSpy(&model, - SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int))); - QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex, int, int))); + SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int))); + QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex,int,int))); rootItem->insertChild(new StubTreeItem("root-2new", rootItem), 1); @@ -307,8 +307,8 @@ TreeModel model(rootItem); QSignalSpy aboutToSpy(&model, - SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int))); - QSignalSpy removedSpy(&model, SIGNAL(rowsRemoved(QModelIndex, int, int))); + SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int))); + QSignalSpy removedSpy(&model, SIGNAL(rowsRemoved(QModelIndex,int,int))); TreeItem* itemToBeRemoved = rootItem->child(1); rootItem->removeChild(itemToBeRemoved); @@ -339,11 +339,11 @@ TreeItem* item = rootItem->child(0)->child(0); QSignalSpy aboutToInsertSpy(&model, - SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int))); - QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex, int, int))); + SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int))); + QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex,int,int))); QSignalSpy aboutToRemoveSpy(&model, - SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int))); - QSignalSpy removedSpy(&model, SIGNAL(rowsRemoved(QModelIndex, int, int))); + SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int))); + QSignalSpy removedSpy(&model, SIGNAL(rowsRemoved(QModelIndex,int,int))); StubTreeItem childToBeRemoved("root-1-1-3", item); item->appendChild(new StubTreeItem("root-1-1-1", item)); @@ -394,11 +394,11 @@ rootItem->child(0)->appendChild(item); QSignalSpy aboutToInsertSpy(&model, - SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int))); - QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex, int, int))); + SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int))); + QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex,int,int))); QSignalSpy aboutToRemoveSpy(&model, - SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int))); - QSignalSpy removedSpy(&model, SIGNAL(rowsRemoved(QModelIndex, int, int))); + SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int))); + QSignalSpy removedSpy(&model, SIGNAL(rowsRemoved(QModelIndex,int,int))); StubTreeItem childToBeRemoved("root-1-1-3", item); item->appendChild(new StubTreeItem("root-1-1-1", item)); @@ -449,8 +449,8 @@ rootItem->removeChild(&item); QSignalSpy aboutToSpy(&model, - SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int))); - QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex, int, int))); + SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int))); + QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex,int,int))); item.appendChild(new StubTreeItem("root-1-1", &item)); @@ -475,8 +475,8 @@ rootItem->removeChild(&item); QSignalSpy aboutToSpy(&model, - SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int))); - QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex, int, int))); + SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int))); + QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex,int,int))); nestedItem->appendChild(new StubTreeItem("root-1-1-1", nestedItem)); @@ -497,7 +497,7 @@ TreeModel model(rootItem); QSignalSpy dataChangedSpy(&model, - SIGNAL(dataChanged(QModelIndex, QModelIndex))); + SIGNAL(dataChanged(QModelIndex,QModelIndex))); item->setText("root-1modified"); @@ -527,7 +527,7 @@ //Qt::Orientation must be registered in order to be used with QSignalSpy int orientationIndexType = qRegisterMetaType<Qt::Orientation>("Qt::Orientation"); QSignalSpy headerDataChangedSpy(&model, - SIGNAL(headerDataChanged(Qt::Orientation, int, int))); + SIGNAL(headerDataChanged(Qt::Orientation,int,int))); rootItem->setText("root modified"); Modified: trunk/ktutorial/ktutorial-library/src/view/TutorialManagerDialog.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/view/TutorialManagerDialog.cpp 2012-08-20 11:16:43 UTC (rev 374) +++ trunk/ktutorial/ktutorial-library/src/view/TutorialManagerDialog.cpp 2012-08-20 12:23:38 UTC (rev 375) @@ -52,7 +52,7 @@ enableButton(User1, false); connect(ui->tutorialsList->selectionModel(), - SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(select(QItemSelection))); connect(this, SIGNAL(user1Clicked()), this, SLOT(start())); Modified: trunk/ktutorial/ktutorial-library/tests/editorsupport/EditorSupportTest.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/tests/editorsupport/EditorSupportTest.cpp 2012-08-20 11:16:43 UTC (rev 374) +++ trunk/ktutorial/ktutorial-library/tests/editorsupport/EditorSupportTest.cpp 2012-08-20 12:23:38 UTC (rev 375) @@ -253,8 +253,8 @@ bus, this); QVERIFY(iface->isValid()); - connect(iface, SIGNAL(eventReceived(int, QString)), - this, SLOT(handleEventReceived(int, QString))); + connect(iface, SIGNAL(eventReceived(int,QString)), + this, SLOT(handleEventReceived(int,QString))); QObject* eventSpyObject = bus.objectRegisteredAt("/ktutorial/EventSpy"); QVERIFY(eventSpyObject); @@ -286,8 +286,8 @@ bus, this); QVERIFY(iface->isValid()); - connect(iface, SIGNAL(eventReceived(int, QString)), - this, SLOT(handleEventReceived(int, QString))); + connect(iface, SIGNAL(eventReceived(int,QString)), + this, SLOT(handleEventReceived(int,QString))); editorSupport.disableEventSpy(); Modified: trunk/ktutorial/ktutorial-library/tests/editorsupport/EventSpyAdaptorTest.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/tests/editorsupport/EventSpyAdaptorTest.cpp 2012-08-20 11:16:43 UTC (rev 374) +++ trunk/ktutorial/ktutorial-library/tests/editorsupport/EventSpyAdaptorTest.cpp 2012-08-20 12:23:38 UTC (rev 375) @@ -53,7 +53,7 @@ ObjectRegister objectRegister; EventSpyAdaptor* adaptor = new EventSpyAdaptor(&spy, &objectRegister); - QSignalSpy eventEmittedSpy(adaptor, SIGNAL(eventReceived(int, QString))); + QSignalSpy eventEmittedSpy(adaptor, SIGNAL(eventReceived(int,QString))); //Send an event not managed by QObject to avoid messing up its internal //state This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-08-20 11:16:52
|
Revision: 374 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=374&view=rev Author: danxuliu Date: 2012-08-20 11:16:43 +0000 (Mon, 20 Aug 2012) Log Message: ----------- Update Spanish translations. Modified Paths: -------------- trunk/ktutorial/ktutorial-editor/doc/es/ktutorial-editor-handbook.po trunk/ktutorial/ktutorial-editor/doc/header.pot trunk/ktutorial/ktutorial-editor/doc/ktutorial-editor-handbook.pot trunk/ktutorial/ktutorial-editor/po/es.po trunk/ktutorial/ktutorial-editor/po/ktutorial-editor.pot trunk/ktutorial/ktutorial-library/po/es.po trunk/ktutorial/ktutorial-library/po/ktutorial.pot Modified: trunk/ktutorial/ktutorial-editor/doc/es/ktutorial-editor-handbook.po =================================================================== --- trunk/ktutorial/ktutorial-editor/doc/es/ktutorial-editor-handbook.po 2012-08-20 11:15:55 UTC (rev 373) +++ trunk/ktutorial/ktutorial-editor/doc/es/ktutorial-editor-handbook.po 2012-08-20 11:16:43 UTC (rev 374) @@ -3,21 +3,22 @@ # Copyright (C) 2010 Daniel Calviño Sánchez # This file is distributed under the same license as the ktutorial-editor handbook. # -# Daniel Calviño Sánchez <dan...@gm...>, 2010, 2011. +# Daniel Calviño Sánchez <dan...@gm...>, 2010, 2011, 2012. msgid "" msgstr "" "Project-Id-Version: ktutorial-editor handbook\n" -"Report-Msgid-Bugs-To: http://sourceforge." -"net/tracker/?group_id=301227&atid=1270278\n" -"POT-Creation-Date: 2011-06-15 15:47+0000\n" -"PO-Revision-Date: 2011-06-15 18:01+0200\n" +"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?" +"group_id=301227&atid=1270278\n" +"POT-Creation-Date: 2012-08-20 11:00+0000\n" +"PO-Revision-Date: 2012-08-20 13:14+0200\n" "Last-Translator: Daniel Calviño Sánchez <dan...@gm...>\n" "Language-Team: Spanish <>\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.4\n" #. Tag: title #: index.docbook:22 @@ -45,55 +46,67 @@ "<email>dan...@gm...</email></othercredit>" #. Tag: holder -#: index.docbook:38 +#: index.docbook:40 #, no-c-format msgid "Daniel Calviño Sánchez" msgstr "Daniel Calviño Sánchez" +#. Tag: date +#: index.docbook:54 +#, no-c-format +msgid "2012-08-18" +msgstr "2012-08-18" + +#. Tag: releaseinfo +#: index.docbook:55 +#, no-c-format +msgid "<releaseinfo>0.5</releaseinfo>" +msgstr "<releaseinfo>0.5</releaseinfo>" + #. Tag: para -#: index.docbook:58 index.docbook:74 +#: index.docbook:60 index.docbook:76 #, no-c-format msgid "&ktutorial-editor; is a graphical editor for KTutorial tutorials." msgstr "&ktutorial-editor; es un editor gráfico de tutoriales para KTutorial." #. Tag: keyword -#: index.docbook:62 +#: index.docbook:64 #, no-c-format msgid "<keyword>KDE</keyword>" msgstr "<keyword>KDE</keyword>" #. Tag: keyword -#: index.docbook:63 +#: index.docbook:65 #, no-c-format msgid "KTutorial editor" msgstr "KTutorial editor" #. Tag: keyword -#: index.docbook:64 +#: index.docbook:66 #, no-c-format msgid "KTutorial" msgstr "KTutorial" #. Tag: keyword -#: index.docbook:65 +#: index.docbook:67 #, no-c-format msgid "tutorial" msgstr "tutorial" #. Tag: keyword -#: index.docbook:66 +#: index.docbook:68 #, no-c-format msgid "editor" msgstr "editor" #. Tag: title -#: index.docbook:72 +#: index.docbook:74 #, no-c-format msgid "Introduction" msgstr "Introducción" #. Tag: para -#: index.docbook:75 +#: index.docbook:77 #, no-c-format msgid "" "KTutorial is a interactive tutorial system for KDE 4. You can get more " @@ -106,7 +119,7 @@ "ulink>." #. Tag: para -#: index.docbook:76 +#: index.docbook:78 #, no-c-format msgid "" "Using &ktutorial-editor; you can design a tutorial for some application " @@ -120,7 +133,7 @@ "seleccione una opción, cierre un diálogo, escriba cierto texto..." #. Tag: para -#: index.docbook:77 +#: index.docbook:79 #, no-c-format msgid "" "Once the tutorial has been designed, it can be exported by &ktutorial-" @@ -134,7 +147,7 @@ "KTutorial y el usuario de la aplicación podrá comenzar el tutorial." #. Tag: para -#: index.docbook:78 +#: index.docbook:80 #, no-c-format msgid "" "Tutorials created by &ktutorial-editor; are not as powerful as fully hand " @@ -149,39 +162,41 @@ "por &ktutorial-editor;." #. Tag: title -#: index.docbook:89 +#: index.docbook:91 #, no-c-format msgid "Credits and License" msgstr "Créditos y licencia" #. Tag: para -#: index.docbook:91 +#: index.docbook:93 #, no-c-format msgid "&ktutorial-editor;" msgstr "&ktutorial-editor;" #. Tag: para -#: index.docbook:94 +#: index.docbook:96 #, no-c-format msgid "" -"Program Copyright 2010 Daniel Calviño Sánchez <email>dan...@gm...</" -"email>" +"Program Copyright 2010-2012 Daniel Calviño Sánchez <email>danxuliu@gmail." +"com</email>" msgstr "" -"Programa Copyright 2010 Daniel Calviño Sánchez <email>dan...@gm...</" +"Programa Copyright 2010-2012 Daniel Calviño Sánchez <email>danxuliu@gmail." +"com</" "email>" #. Tag: para -#: index.docbook:98 +#: index.docbook:100 #, no-c-format msgid "" -"Documentation Copyright 2010 Daniel Calviño Sánchez <email>danxuliu@gmail." -"com</email>" +"Documentation Copyright 2010-2012 Daniel Calviño Sánchez " +"<email>dan...@gm...</email>" msgstr "" -"Documentación Copyright 2010 Daniel Calviño Sánchez <email>danxuliu@gmail." +"Documentación Copyright 2010-2012 Daniel Calviño Sánchez <email>" +"danxuliu@gmail." "com</email>" #. Tag: trans_comment -#: index.docbook:102 +#: index.docbook:104 #, no-c-format msgid "CREDIT_FOR_TRANSLATORS" msgstr "" @@ -189,7 +204,7 @@ "para>" #. Tag: chapter -#: index.docbook:102 +#: index.docbook:104 #, no-c-format msgid "&underFDL; &underGPL;" msgstr "&underFDL; &underGPL;" @@ -1302,8 +1317,27 @@ #: using.docbook:217 #, no-c-format msgid "" -"But note that a name and the object it represents depends on the state of " -"the target application. For example, if there is a dialog named " +"Under some circumstances, an object may not have a unique name. When a name " +"represents two or more objects, KTutorial applies a set of ambiguity solving " +"rules. &ktutorial-editor; takes that into account too, and tries to get a " +"name that identifies the chosen object, even if the name is not unique. But, " +"if even after applying the ambiguity solving rules there is no name that " +"identifies just the chosen object, a warning is shown." +msgstr "" +"En según qué circunstancias, un objeto podría no tener un nombre único. " +"Cuando un nombre representa dos o más objetos, KTutorial aplica un conjunto " +"de reglas para resolver la ambigüedad. &ktutorial-editor; también tiene eso " +"en cuenta, e intenta obtener un nombre que identifique al objeto escogido, " +"incluso si el nombre no es único. Pero, si incluso tras aplicar las reglas " +"para resolver la ambigüedad no hay ningún nombre que identifique sólo al " +"objeto escogido, se mostrará un aviso." + +#. Tag: para +#: using.docbook:218 +#, no-c-format +msgid "" +"However, note that a name and the object it represents depends on the state " +"of the target application. For example, if there is a dialog named " "<literal>Configuration dialog</literal> with a button named <literal>Ok " "button</literal>, its unique name could be just <literal>Ok button</" "literal>. However, if another dialog named <literal>File information dialog</" @@ -1314,7 +1348,8 @@ "situation, <literal>Ok button</literal> would not represent a specific " "object in the target application." msgstr "" -"Pero ten en cuenta que el nombre y el objeto al que representa dependen del " +"No obstante, ten en cuenta que el nombre y el objeto al que representa " +"dependen del " "estado de la aplicación objetivo. Por ejemplo, si hay un diálogo llamado " "<literal>Configuration dialog</literal> con un botón llamado <literal>Ok " "button</literal>, su nombre único podría ser simplemente <literal>Ok button</" @@ -1328,7 +1363,7 @@ "aplicación objetivo." #. Tag: para -#: using.docbook:218 +#: using.docbook:219 #, no-c-format msgid "" "All that means that, when choosing an object from the target application, " @@ -1340,13 +1375,13 @@ "estará cuando se siga el tutorial y se llegue al paso actual." #. Tag: title -#: using.docbook:223 +#: using.docbook:224 #, no-c-format msgid "Testing a tutorial in the target application" msgstr "Probar un tutorial en la aplicación objetivo" #. Tag: para -#: using.docbook:225 +#: using.docbook:226 #, no-c-format msgid "" "Designing a tutorial is not a failproof task. Maybe your custom code does " @@ -1361,7 +1396,7 @@ "veces." #. Tag: para -#: using.docbook:226 +#: using.docbook:227 #, no-c-format msgid "" "Exporting the tutorial to the application data directory and then starting " @@ -1378,7 +1413,7 @@ "desde el paso seleccionado actualmente." #. Tag: para -#: using.docbook:227 +#: using.docbook:228 #, no-c-format msgid "" "Note, however, that after closing the tutorial the target application will " @@ -1394,13 +1429,13 @@ "quieres empezarlo desde la aplicación misma." #. Tag: title -#: using.docbook:231 +#: using.docbook:232 #, no-c-format msgid "Other less noticeable features" msgstr "Otras características menos evidentes" #. Tag: para -#: using.docbook:233 +#: using.docbook:234 #, no-c-format msgid "" "Besides those already mentioned, &ktutorial-editor; uses a running target " @@ -1411,21 +1446,27 @@ "igualmente útiles características." #. Tag: para -#: using.docbook:234 +#: using.docbook:235 #, no-c-format msgid "" "The one-line text editors to set the name of an object have text completion, " "so if instead of choosing the object its name is written directly in the " "text editor it will suggest the name based on the objects in the target " -"application." +"application. The completion will try to suggest unique names; however, two " +"or more proposed names can be duplicated if the objects they represent do " +"not have a unique name, even after applying the ambiguity solving rules." msgstr "" "Los editores de texto de una única línea para establecer el nombre de un " "objeto cuentan con completado de texto, por lo que si en lugar de escoger el " "objeto se escribe su nombre directamente en el editor de texto éste sugerirá " -"el nombre en base a los objetos de la aplicación objetivo." +"el nombre en base a los objetos de la aplicación objetivo. El completado " +"procurará sugerir nombres únicos; sin embargo, dos o más de los nombres " +"propuestos podrían estar duplicados si los objetos a los que representan no " +"tienen un nombre único, incluso tras haber aplicado las reglas para resolver " +"la ambigüedad." #. Tag: para -#: using.docbook:235 +#: using.docbook:236 #, no-c-format msgid "" "The one-line text editor to set the name of a signal also has text " @@ -1440,7 +1481,7 @@ "nombre de las propiedades sigue este mismo esquema." #. Tag: para -#: using.docbook:236 +#: using.docbook:237 #, no-c-format msgid "" "The one-line text editors for step ids in the step data and reaction dialogs " @@ -1455,7 +1496,7 @@ "y el segundo sugerirá los identificadores ya establecidos en los pasos." #. Tag: para -#: using.docbook:237 +#: using.docbook:238 #, no-c-format msgid "" "The text completion uses the standard KDE text completion system, so all the " @@ -1469,25 +1510,25 @@ "todas las propuestas de completado disponibles)." #. Tag: screeninfo -#: using.docbook:240 +#: using.docbook:241 #, no-c-format msgid "An example of text completion for a signal name" msgstr "Un ejemplo de completado de texto para el nombre de una señal" #. Tag: phrase -#: using.docbook:246 +#: using.docbook:247 #, no-c-format msgid "Signal name completion" msgstr "Completado del nombre de una señal" #. Tag: title -#: using.docbook:254 +#: using.docbook:255 #, no-c-format msgid "Saving and loading again the tutorial" msgstr "Guardar y cargar de nuevo el tutorial" #. Tag: para -#: using.docbook:256 +#: using.docbook:257 #, no-c-format msgid "" "&ktutorial-editor; supports saving a tutorial being designed so it can be " @@ -1504,7 +1545,7 @@ "guimenuitem></menuchoice>." #. Tag: para -#: using.docbook:257 +#: using.docbook:258 #, no-c-format msgid "" "Note that tutorials are saved in an XML format specific to &ktutorial-" @@ -1518,7 +1559,7 @@ "\">exportarse</link> para que KTutorial pueda entenderlo." #. Tag: para -#: using.docbook:258 +#: using.docbook:259 #, no-c-format msgid "" "Also note that loading and saving a tutorial does not need to be done from " @@ -1532,7 +1573,7 @@ "(mediante <acronym>FTP</acronym>, <acronym>SSH</acronym>, etc)." #. Tag: para -#: using.docbook:259 +#: using.docbook:260 #, no-c-format msgid "" "When a tutorial is loaded or saved it is added to the recently used file " @@ -1546,13 +1587,13 @@ "una forma rápida de cargar un tutorial usado recientemente de dicha lista." #. Tag: title -#: using.docbook:263 +#: using.docbook:264 #, no-c-format msgid "Exporting the tutorial" msgstr "Exportación del tutorial" #. Tag: para -#: using.docbook:265 +#: using.docbook:266 #, no-c-format msgid "" "Once you have finished designing the tutorial you can export it to a " @@ -1571,7 +1612,7 @@ "\"understanding-ktutorial\"/>." #. Tag: para -#: using.docbook:266 +#: using.docbook:267 #, no-c-format msgid "" "The export dialog also supports exporting to remote directories, although it " @@ -1581,13 +1622,13 @@ "aunque sería muy extraño que necesitases hacer eso." #. Tag: title -#: using.docbook:270 +#: using.docbook:271 #, no-c-format msgid "Command Line Options" msgstr "Opciones de la línea de órdenes" #. Tag: para -#: using.docbook:272 +#: using.docbook:273 #, no-c-format msgid "" "Though &ktutorial-editor; will be usually started from the &kde; program " @@ -1601,7 +1642,7 @@ "disponibles en este caso." #. Tag: para -#: using.docbook:274 +#: using.docbook:275 #, no-c-format msgid "" "Apart from generic &kde; command line options, &ktutorial-editor; optionally " @@ -1611,7 +1652,7 @@ "editor; acepta de manera opcional una URL desde la que cargar un tutorial:" #. Tag: cmdsynopsis -#: using.docbook:275 +#: using.docbook:276 #, no-c-format msgid "" "<command>ktutorial-editor</command> <arg choice=\"opt\" rep=\"norepeat" @@ -1621,7 +1662,7 @@ "\">URL</arg>" #. Tag: para -#: using.docbook:276 +#: using.docbook:277 #, no-c-format msgid "" "The URL does not need to be a local file; remote directories are also " @@ -1631,38 +1672,38 @@ "remotos." #. Tag: title -#: using.docbook:279 +#: using.docbook:280 #, no-c-format msgid "Default &kde; Command Line Options" msgstr "Opciones por defecto de &kde; de la línea de órdenes" #. Tag: para -#: using.docbook:281 +#: using.docbook:282 #, no-c-format msgid "The following command line help options are available:" msgstr "" "Las siguientes opciones de ayuda en la línea de órdenes están disponibles:" #. Tag: command -#: using.docbook:286 +#: using.docbook:287 #, no-c-format msgid "ktutorial-editor <option>--help</option>" msgstr "ktutorial-editor <option>--help</option>" #. Tag: para -#: using.docbook:289 +#: using.docbook:290 #, no-c-format msgid "This lists the most basic options available at the command line." msgstr "Lista las opciones más básicas disponibles en la línea de órdenes." #. Tag: command -#: using.docbook:295 +#: using.docbook:296 #, no-c-format msgid "ktutorial-editor <option>--help-qt</option>" msgstr "ktutorial-editor <option>--help-qt</option>" #. Tag: para -#: using.docbook:298 +#: using.docbook:299 #, no-c-format msgid "" "This lists the options available for changing the way &ktutorial-editor; " @@ -1672,13 +1713,13 @@ "editor; interacciona con &Qt;." #. Tag: command -#: using.docbook:304 +#: using.docbook:305 #, no-c-format msgid "ktutorial-editor <option>--help-kde</option>" msgstr "ktutorial-editor <option>--help-kde</option>" #. Tag: para -#: using.docbook:307 +#: using.docbook:308 #, no-c-format msgid "" "This lists the options available for changing the way &ktutorial-editor; " @@ -1688,37 +1729,37 @@ "editor; interacciona con &kde;." #. Tag: command -#: using.docbook:313 +#: using.docbook:314 #, no-c-format msgid "ktutorial-editor <option>--help-all</option>" msgstr "ktutorial-editor <option>--help-all</option>" #. Tag: para -#: using.docbook:316 +#: using.docbook:317 #, no-c-format msgid "This lists all of the command line options." msgstr "Lista todas las opciones de la línea de órdenes." #. Tag: command -#: using.docbook:322 +#: using.docbook:323 #, no-c-format msgid "ktutorial-editor <option>--author</option>" msgstr "ktutorial-editor <option>--author</option>" #. Tag: para -#: using.docbook:325 +#: using.docbook:326 #, no-c-format msgid "Lists &ktutorial-editor;'s author in the terminal window." msgstr "Lista los autores de &ktutorial-editor; en la terminal." #. Tag: command -#: using.docbook:331 +#: using.docbook:332 #, no-c-format msgid "ktutorial-editor <option>--version</option>" msgstr "ktutorial-editor <option>--version</option>" #. Tag: para -#: using.docbook:334 +#: using.docbook:335 #, no-c-format msgid "" "Lists version information for &Qt;, &kde;, and &ktutorial-editor;. Also " @@ -1729,13 +1770,13 @@ "command>." #. Tag: command -#: using.docbook:340 +#: using.docbook:341 #, no-c-format msgid "ktutorial-editor <option>--license</option>" msgstr "ktutorial-editor <option>--license</option>" #. Tag: para -#: using.docbook:343 +#: using.docbook:344 #, no-c-format msgid "Shows &ktutorial-editor;'s license text in the terminal window." msgstr "Muestra el texto de la licencia de &ktutorial-editor; en la terminal." @@ -2133,8 +2174,8 @@ "<guimenu>Edit</guimenu> <guimenuitem>Test tutorial from current step</" "guimenuitem>" msgstr "" -"<guimenu>Editar</guimenu> <guimenuitem>Probar tutorial desde el paso actual<" -"/guimenuitem>" +"<guimenu>Editar</guimenu> <guimenuitem>Probar tutorial desde el paso actual</" +"guimenuitem>" #. Tag: action #: commands.docbook:350 @@ -2358,10 +2399,10 @@ #, no-c-format msgid "" "In order to successfully build and use KTutorial, you need &kde; (at least " -"version 4.3) and, therefore, &Qt; (at least version 4.5.3)." +"version 4.3) and, therefore, &Qt; (at least version 4.6)." msgstr "" "Para poder compilar y utilizar KTutorial con éxito, necesitas &kde; (al " -"menos la versión 4.3) y, por tanto, &Qt; (al menos la versión 4.5.3)." +"menos la versión 4.3) y, por tanto, &Qt; (al menos la versión 4.6)." #. Tag: para #: installation.docbook:27 @@ -2417,8 +2458,7 @@ msgstr "" "<prompt>$</prompt> <userinput><command>mkdir</command> build && " "<command>cd</command> build</userinput>\n" -"<prompt>$</prompt> <userinput><command>cmake</command> ..</" -"userinput>\n" +"<prompt>$</prompt> <userinput><command>cmake</command> ..</userinput>\n" "<prompt>$</prompt> <userinput><command>make</command></userinput>" #. Tag: para Modified: trunk/ktutorial/ktutorial-editor/doc/header.pot =================================================================== --- trunk/ktutorial/ktutorial-editor/doc/header.pot 2012-08-20 11:15:55 UTC (rev 373) +++ trunk/ktutorial/ktutorial-editor/doc/header.pot 2012-08-20 11:16:43 UTC (rev 374) @@ -9,7 +9,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?" "group_id=301227&atid=1270278\n" -"POT-Creation-Date: 2011-06-15 15:47+0000\n" +"POT-Creation-Date: 2012-08-20 11:00+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" Modified: trunk/ktutorial/ktutorial-editor/doc/ktutorial-editor-handbook.pot =================================================================== --- trunk/ktutorial/ktutorial-editor/doc/ktutorial-editor-handbook.pot 2012-08-20 11:15:55 UTC (rev 373) +++ trunk/ktutorial/ktutorial-editor/doc/ktutorial-editor-handbook.pot 2012-08-20 11:16:43 UTC (rev 374) @@ -9,7 +9,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?" "group_id=301227&atid=1270278\n" -"POT-Creation-Date: 2011-06-15 15:47+0000\n" +"POT-Creation-Date: 2012-08-20 11:00+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -38,55 +38,67 @@ msgstr "" #. Tag: holder -#: index.docbook:38 +#: index.docbook:40 #, no-c-format msgid "Daniel Calviño Sánchez" msgstr "" +#. Tag: date +#: index.docbook:54 +#, no-c-format +msgid "2012-08-18" +msgstr "" + +#. Tag: releaseinfo +#: index.docbook:55 +#, no-c-format +msgid "<releaseinfo>0.5</releaseinfo>" +msgstr "" + #. Tag: para -#: index.docbook:58 index.docbook:74 +#: index.docbook:60 index.docbook:76 #, no-c-format msgid "&ktutorial-editor; is a graphical editor for KTutorial tutorials." msgstr "" #. Tag: keyword -#: index.docbook:62 +#: index.docbook:64 #, no-c-format msgid "<keyword>KDE</keyword>" msgstr "" #. Tag: keyword -#: index.docbook:63 +#: index.docbook:65 #, no-c-format msgid "KTutorial editor" msgstr "" #. Tag: keyword -#: index.docbook:64 +#: index.docbook:66 #, no-c-format msgid "KTutorial" msgstr "" #. Tag: keyword -#: index.docbook:65 +#: index.docbook:67 #, no-c-format msgid "tutorial" msgstr "" #. Tag: keyword -#: index.docbook:66 +#: index.docbook:68 #, no-c-format msgid "editor" msgstr "" #. Tag: title -#: index.docbook:72 +#: index.docbook:74 #, no-c-format msgid "Introduction" msgstr "" #. Tag: para -#: index.docbook:75 +#: index.docbook:77 #, no-c-format msgid "" "KTutorial is a interactive tutorial system for KDE 4. You can get more " @@ -95,7 +107,7 @@ msgstr "" #. Tag: para -#: index.docbook:76 +#: index.docbook:78 #, no-c-format msgid "" "Using &ktutorial-editor; you can design a tutorial for some application " @@ -105,7 +117,7 @@ msgstr "" #. Tag: para -#: index.docbook:77 +#: index.docbook:79 #, no-c-format msgid "" "Once the tutorial has been designed, it can be exported by &ktutorial-" @@ -115,7 +127,7 @@ msgstr "" #. Tag: para -#: index.docbook:78 +#: index.docbook:80 #, no-c-format msgid "" "Tutorials created by &ktutorial-editor; are not as powerful as fully hand " @@ -125,41 +137,41 @@ msgstr "" #. Tag: title -#: index.docbook:89 +#: index.docbook:91 #, no-c-format msgid "Credits and License" msgstr "" #. Tag: para -#: index.docbook:91 +#: index.docbook:93 #, no-c-format msgid "&ktutorial-editor;" msgstr "" #. Tag: para -#: index.docbook:94 +#: index.docbook:96 #, no-c-format msgid "" -"Program Copyright 2010 Daniel Calviño Sánchez <email>dan...@gm...</" -"email>" +"Program Copyright 2010-2012 Daniel Calviño Sánchez <email>danxuliu@gmail." +"com</email>" msgstr "" #. Tag: para -#: index.docbook:98 +#: index.docbook:100 #, no-c-format msgid "" -"Documentation Copyright 2010 Daniel Calviño Sánchez <email>danxuliu@gmail." -"com</email>" +"Documentation Copyright 2010-2012 Daniel Calviño Sánchez " +"<email>dan...@gm...</email>" msgstr "" #. Tag: trans_comment -#: index.docbook:102 +#: index.docbook:104 #, no-c-format msgid "CREDIT_FOR_TRANSLATORS" msgstr "" #. Tag: chapter -#: index.docbook:102 +#: index.docbook:104 #, no-c-format msgid "&underFDL; &underGPL;" msgstr "" @@ -961,8 +973,20 @@ #: using.docbook:217 #, no-c-format msgid "" -"But note that a name and the object it represents depends on the state of " -"the target application. For example, if there is a dialog named " +"Under some circumstances, an object may not have a unique name. When a name " +"represents two or more objects, KTutorial applies a set of ambiguity solving " +"rules. &ktutorial-editor; takes that into account too, and tries to get a " +"name that identifies the chosen object, even if the name is not unique. But, " +"if even after applying the ambiguity solving rules there is no name that " +"identifies just the chosen object, a warning is shown." +msgstr "" + +#. Tag: para +#: using.docbook:218 +#, no-c-format +msgid "" +"However, note that a name and the object it represents depends on the state " +"of the target application. For example, if there is a dialog named " "<literal>Configuration dialog</literal> with a button named <literal>Ok " "button</literal>, its unique name could be just <literal>Ok button</" "literal>. However, if another dialog named <literal>File information dialog</" @@ -975,7 +999,7 @@ msgstr "" #. Tag: para -#: using.docbook:218 +#: using.docbook:219 #, no-c-format msgid "" "All that means that, when choosing an object from the target application, " @@ -984,13 +1008,13 @@ msgstr "" #. Tag: title -#: using.docbook:223 +#: using.docbook:224 #, no-c-format msgid "Testing a tutorial in the target application" msgstr "" #. Tag: para -#: using.docbook:225 +#: using.docbook:226 #, no-c-format msgid "" "Designing a tutorial is not a failproof task. Maybe your custom code does " @@ -1000,7 +1024,7 @@ msgstr "" #. Tag: para -#: using.docbook:226 +#: using.docbook:227 #, no-c-format msgid "" "Exporting the tutorial to the application data directory and then starting " @@ -1011,7 +1035,7 @@ msgstr "" #. Tag: para -#: using.docbook:227 +#: using.docbook:228 #, no-c-format msgid "" "Note, however, that after closing the tutorial the target application will " @@ -1022,13 +1046,13 @@ msgstr "" #. Tag: title -#: using.docbook:231 +#: using.docbook:232 #, no-c-format msgid "Other less noticeable features" msgstr "" #. Tag: para -#: using.docbook:233 +#: using.docbook:234 #, no-c-format msgid "" "Besides those already mentioned, &ktutorial-editor; uses a running target " @@ -1036,17 +1060,19 @@ msgstr "" #. Tag: para -#: using.docbook:234 +#: using.docbook:235 #, no-c-format msgid "" "The one-line text editors to set the name of an object have text completion, " "so if instead of choosing the object its name is written directly in the " "text editor it will suggest the name based on the objects in the target " -"application." +"application. The completion will try to suggest unique names; however, two " +"or more proposed names can be duplicated if the objects they represent do " +"not have a unique name, even after applying the ambiguity solving rules." msgstr "" #. Tag: para -#: using.docbook:235 +#: using.docbook:236 #, no-c-format msgid "" "The one-line text editor to set the name of a signal also has text " @@ -1056,7 +1082,7 @@ msgstr "" #. Tag: para -#: using.docbook:236 +#: using.docbook:237 #, no-c-format msgid "" "The one-line text editors for step ids in the step data and reaction dialogs " @@ -1066,7 +1092,7 @@ msgstr "" #. Tag: para -#: using.docbook:237 +#: using.docbook:238 #, no-c-format msgid "" "The text completion uses the standard KDE text completion system, so all the " @@ -1076,25 +1102,25 @@ msgstr "" #. Tag: screeninfo -#: using.docbook:240 +#: using.docbook:241 #, no-c-format msgid "An example of text completion for a signal name" msgstr "" #. Tag: phrase -#: using.docbook:246 +#: using.docbook:247 #, no-c-format msgid "Signal name completion" msgstr "" #. Tag: title -#: using.docbook:254 +#: using.docbook:255 #, no-c-format msgid "Saving and loading again the tutorial" msgstr "" #. Tag: para -#: using.docbook:256 +#: using.docbook:257 #, no-c-format msgid "" "&ktutorial-editor; supports saving a tutorial being designed so it can be " @@ -1105,7 +1131,7 @@ msgstr "" #. Tag: para -#: using.docbook:257 +#: using.docbook:258 #, no-c-format msgid "" "Note that tutorials are saved in an XML format specific to &ktutorial-" @@ -1115,7 +1141,7 @@ msgstr "" #. Tag: para -#: using.docbook:258 +#: using.docbook:259 #, no-c-format msgid "" "Also note that loading and saving a tutorial does not need to be done from " @@ -1125,7 +1151,7 @@ msgstr "" #. Tag: para -#: using.docbook:259 +#: using.docbook:260 #, no-c-format msgid "" "When a tutorial is loaded or saved it is added to the recently used file " @@ -1135,13 +1161,13 @@ msgstr "" #. Tag: title -#: using.docbook:263 +#: using.docbook:264 #, no-c-format msgid "Exporting the tutorial" msgstr "" #. Tag: para -#: using.docbook:265 +#: using.docbook:266 #, no-c-format msgid "" "Once you have finished designing the tutorial you can export it to a " @@ -1153,7 +1179,7 @@ msgstr "" #. Tag: para -#: using.docbook:266 +#: using.docbook:267 #, no-c-format msgid "" "The export dialog also supports exporting to remote directories, although it " @@ -1161,13 +1187,13 @@ msgstr "" #. Tag: title -#: using.docbook:270 +#: using.docbook:271 #, no-c-format msgid "Command Line Options" msgstr "" #. Tag: para -#: using.docbook:272 +#: using.docbook:273 #, no-c-format msgid "" "Though &ktutorial-editor; will be usually started from the &kde; program " @@ -1177,7 +1203,7 @@ msgstr "" #. Tag: para -#: using.docbook:274 +#: using.docbook:275 #, no-c-format msgid "" "Apart from generic &kde; command line options, &ktutorial-editor; optionally " @@ -1185,7 +1211,7 @@ msgstr "" #. Tag: cmdsynopsis -#: using.docbook:275 +#: using.docbook:276 #, no-c-format msgid "" "<command>ktutorial-editor</command> <arg choice=\"opt\" rep=\"norepeat" @@ -1193,7 +1219,7 @@ msgstr "" #. Tag: para -#: using.docbook:276 +#: using.docbook:277 #, no-c-format msgid "" "The URL does not need to be a local file; remote directories are also " @@ -1201,37 +1227,37 @@ msgstr "" #. Tag: title -#: using.docbook:279 +#: using.docbook:280 #, no-c-format msgid "Default &kde; Command Line Options" msgstr "" #. Tag: para -#: using.docbook:281 +#: using.docbook:282 #, no-c-format msgid "The following command line help options are available:" msgstr "" #. Tag: command -#: using.docbook:286 +#: using.docbook:287 #, no-c-format msgid "ktutorial-editor <option>--help</option>" msgstr "" #. Tag: para -#: using.docbook:289 +#: using.docbook:290 #, no-c-format msgid "This lists the most basic options available at the command line." msgstr "" #. Tag: command -#: using.docbook:295 +#: using.docbook:296 #, no-c-format msgid "ktutorial-editor <option>--help-qt</option>" msgstr "" #. Tag: para -#: using.docbook:298 +#: using.docbook:299 #, no-c-format msgid "" "This lists the options available for changing the way &ktutorial-editor; " @@ -1239,13 +1265,13 @@ msgstr "" #. Tag: command -#: using.docbook:304 +#: using.docbook:305 #, no-c-format msgid "ktutorial-editor <option>--help-kde</option>" msgstr "" #. Tag: para -#: using.docbook:307 +#: using.docbook:308 #, no-c-format msgid "" "This lists the options available for changing the way &ktutorial-editor; " @@ -1253,37 +1279,37 @@ msgstr "" #. Tag: command -#: using.docbook:313 +#: using.docbook:314 #, no-c-format msgid "ktutorial-editor <option>--help-all</option>" msgstr "" #. Tag: para -#: using.docbook:316 +#: using.docbook:317 #, no-c-format msgid "This lists all of the command line options." msgstr "" #. Tag: command -#: using.docbook:322 +#: using.docbook:323 #, no-c-format msgid "ktutorial-editor <option>--author</option>" msgstr "" #. Tag: para -#: using.docbook:325 +#: using.docbook:326 #, no-c-format msgid "Lists &ktutorial-editor;'s author in the terminal window." msgstr "" #. Tag: command -#: using.docbook:331 +#: using.docbook:332 #, no-c-format msgid "ktutorial-editor <option>--version</option>" msgstr "" #. Tag: para -#: using.docbook:334 +#: using.docbook:335 #, no-c-format msgid "" "Lists version information for &Qt;, &kde;, and &ktutorial-editor;. Also " @@ -1291,13 +1317,13 @@ msgstr "" #. Tag: command -#: using.docbook:340 +#: using.docbook:341 #, no-c-format msgid "ktutorial-editor <option>--license</option>" msgstr "" #. Tag: para -#: using.docbook:343 +#: using.docbook:344 #, no-c-format msgid "Shows &ktutorial-editor;'s license text in the terminal window." msgstr "" @@ -1830,7 +1856,7 @@ #, no-c-format msgid "" "In order to successfully build and use KTutorial, you need &kde; (at least " -"version 4.3) and, therefore, &Qt; (at least version 4.5.3)." +"version 4.3) and, therefore, &Qt; (at least version 4.6)." msgstr "" #. Tag: para Modified: trunk/ktutorial/ktutorial-editor/po/es.po =================================================================== --- trunk/ktutorial/ktutorial-editor/po/es.po 2012-08-20 11:15:55 UTC (rev 373) +++ trunk/ktutorial/ktutorial-editor/po/es.po 2012-08-20 11:16:43 UTC (rev 374) @@ -3,21 +3,22 @@ # Copyright (C) 2010 Daniel Calviño Sánchez # This file is distributed under the same license as the ktutorial-editor package. # -# Daniel Calviño Sánchez <dan...@gm...>, 2010, 2011. +# Daniel Calviño Sánchez <dan...@gm...>, 2010, 2011, 2012. msgid "" msgstr "" "Project-Id-Version: ktutorial-editor\n" -"Report-Msgid-Bugs-To: http://sourceforge." -"net/tracker/?group_id=301227&atid=1270278\n" -"POT-Creation-Date: 2011-06-15 15:24+0200\n" -"PO-Revision-Date: 2011-06-15 15:26+0200\n" +"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?" +"group_id=301227&atid=1270278\n" +"POT-Creation-Date: 2012-08-20 13:00+0200\n" +"PO-Revision-Date: 2012-08-20 13:05+0200\n" "Last-Translator: Daniel Calviño Sánchez <dan...@gm...>\n" "Language-Team: Spanish <>\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.4\n" #: commands/ReactionCommands.cpp:36 msgctxt "@action" @@ -353,8 +354,8 @@ #: main.cpp:32 msgctxt "@info:credit" -msgid "Copyright (c) 2010 Daniel Calviño Sánchez" -msgstr "Copyright (c) 2010 Daniel Calviño Sánchez" +msgid "Copyright (c) 2010-2012 Daniel Calviño Sánchez" +msgstr "Copyright (c) 2010-2012 Daniel Calviño Sánchez" #: main.cpp:33 msgctxt "@info:credit" @@ -695,11 +696,11 @@ "reaccionará cuando el usuario escriba algo en el área de texto. Pero, ¿cómo " "debería reaccionar?</para>\n" "\n" -"<para>Queremos avanzar al siguiente paso cuando el usuario escriba " -"<emphasis>¡Hola mundo!</emphasis>, pero textChanged() se emite cada vez que " -"se cambia el texto independientemente de lo escrito. Así que, antes de " -"cambiar al siguiente paso, debemos comprobar que el área de texto contiene " -"el texto esperado.</para>\n" +"<para>Queremos avanzar al siguiente paso cuando el usuario escriba <emphasis>" +"¡Hola mundo!</emphasis>, pero textChanged() se emite cada vez que se cambia " +"el texto independientemente de lo escrito. Así que, antes de cambiar al " +"siguiente paso, debemos comprobar que el área de texto contiene el texto " +"esperado.</para>\n" "\n" "<para>Las comprobaciones se harán utilizando cierto código Javascript " "propio, así que selecciona el <link url=\"widget:responseCodeRadioButton" @@ -777,7 +778,7 @@ "<emphasis>Ahora debes activar la acción de limpiar. Para hacer esto puedes " "hacer click en <interface>Archivo|Limpiar</interface> o en el " "botón de la barra de herramientas llamado <interface>Limpiar</" -"interface>.</emphasis>, luego acepta el diálogo.</para>\n" +"interface>.</emphasis> como texto, luego acepta el diálogo.</para>\n" "\n" "<para>Al igual que <emphasis><emphasis></emphasis> en el texto del " "paso start, <emphasis><interface></emphasis> es otro marcado especial " @@ -1024,7 +1025,7 @@ "nueva reacción.</para>" #: tutorials/InteractingWithTheTargetApplication.js:92 -#: tutorials/InteractingWithTheTargetApplication.js:373 +#: tutorials/InteractingWithTheTargetApplication.js:375 msgctxt "@info" msgid "" "<para>Set the trigger type to <link url=\"widget:triggerConditionRadioButton" @@ -1035,7 +1036,7 @@ "link>.</para>" #: tutorials/InteractingWithTheTargetApplication.js:106 -#: tutorials/InteractingWithTheTargetApplication.js:387 +#: tutorials/InteractingWithTheTargetApplication.js:389 msgctxt "@info" msgid "" "<para><link url=\"widget:addButton\"><interface>Add</interface></link> a new " @@ -1062,17 +1063,17 @@ msgstr "Se muestra la ventana especificada" #: tutorials/InteractingWithTheTargetApplication.js:141 -#: tutorials/InteractingWithTheTargetApplication.js:422 +#: tutorials/InteractingWithTheTargetApplication.js:424 msgctxt "@info" msgid "" -"<para><link url=\"widget:okButton\">Accept the dialog</link> to add the " -"condition to wait for.</para>" +"<para><link url=\"widget:addWaitForDialog/okButton\">Accept the dialog</" +"link> to add the condition to wait for.</para>" msgstr "" -"<para><link url=\"widget:okButton\">Acepta el diálogo</link> para añadir la " -"condición por la que esperar.</para>" +"<para><link url=\"widget:addWaitForDialog/okButton\">Acepta el diálogo</" +"link> para añadir la condición por la que esperar.</para>" #: tutorials/InteractingWithTheTargetApplication.js:155 -#: tutorials/InteractingWithTheTargetApplication.js:436 +#: tutorials/InteractingWithTheTargetApplication.js:438 msgctxt "@info" msgid "" "<para>Select the condition just added and <link url=\"widget:editButton" @@ -1184,7 +1185,13 @@ "<para>Sí, supongo que tendría que haberte avisado de esto cuando empezaste " "este tutorial :P</para>" -#: tutorials/InteractingWithTheTargetApplication.js:213 +#: tutorials/InteractingWithTheTargetApplication.js:204 +#: tutorials/InteractingWithTheTargetApplication.js:217 +msgctxt "@action Tutorial option" +msgid "Continue" +msgstr "Continuar" + +#: tutorials/InteractingWithTheTargetApplication.js:214 msgctxt "@info" msgid "" "<para>Now you have the list with the objects that KTutorial can access in " @@ -1231,7 +1238,7 @@ "<emphasis>setTutorialInformationToolButton</emphasis>, sólo se remarcará el " "botón para establecer la información del tutorial.</para>" -#: tutorials/InteractingWithTheTargetApplication.js:225 +#: tutorials/InteractingWithTheTargetApplication.js:227 msgctxt "@info" msgid "" "<para>You may have noticed that the list does not contain the object we are " @@ -1247,7 +1254,8 @@ "it is the dialog that has just been shown.</para>\n" "\n" "<para>Select the <emphasis>StepDataDialog</emphasis> element in the list and " -"<link url=\"widget:okButton\">accept the dialog</link>.</para>" +"<link url=\"widget:RemoteObjectChooser/okButton\">accept the dialog</link>.</" +"para>" msgstr "" "<para>Puede que te hayas dado cuenta de que la lista no contiene el objeto " "que estamos buscando, es decir, el diálogo que se muestra para añadir un " @@ -1262,18 +1270,19 @@ "emphasis> y, sí, es el diálogo que se acaba de mostrar.</para>\n" "\n" "<para>Selecciona el elemento <emphasis>StepDataDialog</emphasis> en la lista " -"y <link url=\"widget:okButton\">acepta el diálogo</link>.</para>" +"y <link url=\"widget:RemoteObjectChooser/okButton\">acepta el diálogo</link>." +"</para>" -#: tutorials/InteractingWithTheTargetApplication.js:239 +#: tutorials/InteractingWithTheTargetApplication.js:241 msgctxt "@info" msgid "" -"<para>Now that the name of the window was set <link url=\"widget:okButton" -"\">accept the dialog</link>.</para>" +"<para>Now that the name of the window was set <link url=\"widget:" +"editWaitForWindowDialog/okButton\">accept the dialog</link>.</para>" msgstr "" "<para>Ahora que se estableció el nombre de la ventana <link url=\"widget:" -"okButton\">acepta el diálogo.</link>.</para>" +"editWaitForWindowDialog/okButton\">acepta el diálogo.</link>.</para>" -#: tutorials/InteractingWithTheTargetApplication.js:253 +#: tutorials/InteractingWithTheTargetApplication.js:255 msgctxt "@info" msgid "" "<para>We want to change to another step when the window is shown, so now it " @@ -1288,10 +1297,10 @@ "<para>Pon <emphasis>acceptDialog</emphasis> como el <link url=\"widget:" "responseStepLineEdit\">paso al que cambiar</link>.</para>" -#: tutorials/InteractingWithTheTargetApplication.js:274 -#: tutorials/InteractingWithTheTargetApplication.js:345 -#: tutorials/InteractingWithTheTargetApplication.js:562 -#: tutorials/InteractingWithTheTargetApplication.js:632 +#: tutorials/InteractingWithTheTargetApplication.js:276 +#: tutorials/InteractingWithTheTargetApplication.js:347 +#: tutorials/InteractingWithTheTargetApplication.js:564 +#: tutorials/InteractingWithTheTargetApplication.js:634 msgctxt "@info" msgid "" "<para>And finally <link url=\"widget:okButton\">accept the dialog</link>.</" @@ -1300,7 +1309,7 @@ "<para>Y finalmente <link url=\"widget:okButton\">acepta el diálogo</link>.</" "para>" -#: tutorials/InteractingWithTheTargetApplication.js:288 +#: tutorials/InteractingWithTheTargetApplication.js:290 msgctxt "@info" msgid "" "<para>We are done with the first step. Now we will take care of the second " @@ -1315,7 +1324,7 @@ "<para>Por supuesto, lo primero que hay que hacer es <link url=\"widget:" "addStepToolButton\">añadir un nuevo paso</link>.</para>" -#: tutorials/InteractingWithTheTargetApplication.js:302 +#: tutorials/InteractingWithTheTargetApplication.js:304 msgctxt "@info" msgid "" "<para>Set the <link url=\"widget:idLineEdit\">id of the step</link> to " @@ -1324,7 +1333,7 @@ "<para>Pon <emphasis>acceptDialog</emphasis> como el <link url=\"widget:" "idLineEdit\">identificador del paso</link>.</para>" -#: tutorials/InteractingWithTheTargetApplication.js:323 +#: tutorials/InteractingWithTheTargetApplication.js:325 msgctxt "@info" msgid "" "<para>Set the <link url=\"widget:textTextEdit\">text of the step</link> to:</" @@ -1347,7 +1356,7 @@ "<para>Recuerda que puedes copiar el texto de encima y pegarlo en el área de " "texto, no tienes que escribirlo por ti mismo.</para>" -#: tutorials/InteractingWithTheTargetApplication.js:336 +#: tutorials/InteractingWithTheTargetApplication.js:338 msgid "" "Set the id to <emphasis>start</emphasis> and the text to <" "emphasis>First step</emphasis>, then accept the dialog." @@ -1355,7 +1364,7 @@ "Pon <emphasis>start</emphasis> como identificador y <" "emphasis>Primer paso</emphasis> como texto, luego acepta el diálogo." -#: tutorials/InteractingWithTheTargetApplication.js:359 +#: tutorials/InteractingWithTheTargetApplication.js:361 msgctxt "@info" msgid "" "<para>Now, select the <emphasis>acceptDialog</emphasis> step and add a new " @@ -1364,7 +1373,7 @@ "<para>Ahora, selecciona el paso <emphasis>acceptDialog</emphasis> y añádele " "una nueva reacción.</para>" -#: tutorials/InteractingWithTheTargetApplication.js:401 +#: tutorials/InteractingWithTheTargetApplication.js:403 msgctxt "@info" msgid "" "<para>To wait for the user to accept the dialog we will wait for the user to " @@ -1381,12 +1390,12 @@ "selecciona <emphasis>Se emite la señal especificada</emphasis> en la <link " "url=\"widget:waitForTypeComboBox\">lista desplegable</link>.</para>" -#: tutorials/InteractingWithTheTargetApplication.js:413 rc.cpp:49 +#: tutorials/InteractingWithTheTargetApplication.js:415 rc.cpp:49 msgctxt "@item:inlistbox" msgid "The specified signal is emitted" msgstr "Se emite la señal especificada" -#: tutorials/InteractingWithTheTargetApplication.js:450 +#: tutorials/InteractingWithTheTargetApplication.js:452 msgctxt "@info" msgid "" "<para>We are again in a point where we need to know the name of an object, " @@ -1426,7 +1435,7 @@ "\"widget:objectNameLineEdit\">campo del nombre del emisor</link> y ve cómo " "aparece la lista de completado.</para>" -#: tutorials/InteractingWithTheTargetApplication.js:471 +#: tutorials/InteractingWithTheTargetApplication.js:473 msgctxt "@info" msgid "" "<para>As you can see, the completion list proposes <emphasis>okButton</" @@ -1452,7 +1461,7 @@ "la lista utilizando las teclas de arriba y abajo pulsando intro cuando " "llegues a la deseada.</para>" -#: tutorials/InteractingWithTheTargetApplication.js:492 +#: tutorials/InteractingWithTheTargetApplication.js:494 msgctxt "@info" msgid "" "<para>The signal name field also provides completion when the target " @@ -1476,7 +1485,7 @@ "darle el foco, luego presiona <shortcut>Ctrl+T</shortcut> para mostrar todas " "las señales que puede emitir el botón <interface>Aceptar</interface>.</para>" -#: tutorials/InteractingWithTheTargetApplication.js:506 +#: tutorials/InteractingWithTheTargetApplication.js:508 msgctxt "@info" msgid "" "<para>As it was explained before, we want to react when the <interface>Ok</" @@ -1487,16 +1496,16 @@ "click en el botón <interface>Aceptar</interface>, así que selecciona la " "señal <emphasis>clicked()</emphasis> de la lista de completado.</para>" -#: tutorials/InteractingWithTheTargetApplication.js:527 +#: tutorials/InteractingWithTheTargetApplication.js:529 msgctxt "@info" msgid "" "<para>Now that the emitter and signal names were set <link url=\"widget:" -"okButton\">accept the dialog</link>.</para>" +"editWaitForSignalDialog/okButton\">accept the dialog</link>.</para>" msgstr "" "<para>Ahora que se establecieron los nombres del emisor y la señal <link url=" -"\"widget:okButton\">acepta the diálogo</link>.</para>" +"\"widget:editWaitForSignalDialog/okButton\">acepta el diálogo</link>.</para>" -#: tutorials/InteractingWithTheTargetApplication.js:541 +#: tutorials/InteractingWithTheTargetApplication.js:543 msgctxt "@info" msgid "" "<para>The user accepting the dialog to add a new step will make our example " @@ -1511,7 +1520,7 @@ "<para>Pon <emphasis>end</emphasis> como el <link url=\"widget:" "responseStepLineEdit\">paso al que cambiar</link>.</para>" -#: tutorials/InteractingWithTheTargetApplication.js:576 +#: tutorials/InteractingWithTheTargetApplication.js:578 msgctxt "@info" msgid "" "<para>The last step in the tutorial will just inform the user that the " @@ -1526,7 +1535,7 @@ "<para>Como con los anteriores, tenemos que empezar por <link url=\"widget:" "addStepToolButton\">añadir un nuevo paso</link>.</para>" -#: tutorials/InteractingWithTheTargetApplication.js:590 +#: tutorials/InteractingWithTheTargetApplication.js:592 msgctxt "@info" msgid "" "<para>Set the <link url=\"widget:idLineEdit\">id of the step</link> to " @@ -1535,7 +1544,7 @@ "<para>Pon <emphasis>end</emphasis> como <link url=\"widget:idLineEdit" "\">identificador del paso</link>.</para>" -#: tutorials/InteractingWithTheTargetApplication.js:611 +#: tutorials/InteractingWithTheTargetApplication.js:613 msgctxt "@info" msgid "" "<para>Set the <link url=\"widget:textTextEdit\">text of the step</link> to:</" @@ -1548,11 +1557,11 @@ "\n" "<para><emphasis>¡Y eso es todo!</emphasis></para>" -#: tutorials/InteractingWithTheTargetApplication.js:623 +#: tutorials/InteractingWithTheTargetApplication.js:625 msgid "And that's all!" msgstr "¡Y eso es todo!" -#: tutorials/InteractingWithTheTargetApplication.js:646 +#: tutorials/InteractingWithTheTargetApplication.js:648 msgctxt "@info" msgid "" "<para>Well, now that we have added that last step the example tutorial is " @@ -1593,7 +1602,7 @@ "<interface>Editar|Probar tutorial</interface>, o en el botón " "<interface>Probar tutorial</interface> de la barra de herramientas.</para>" -#: tutorials/InteractingWithTheTargetApplication.js:660 +#: tutorials/InteractingWithTheTargetApplication.js:662 msgctxt "@info" msgid "" "<para>The tutorial shown in the target application is the one we have been " @@ -1718,7 +1727,7 @@ msgstr "" "Se ocultarán las ventanas de <application>KTutorial editor</application>" -#: view/RemoteObjectNameWidget.cpp:168 +#: view/RemoteObjectNameWidget.cpp:203 msgctxt "@label" msgid "" "The object name can not be set, there was a problem getting the name from " @@ -1727,11 +1736,29 @@ "No se puede establecer el nombre del objeto, hubo un problema obteniendo el " "nombre desde la aplicación objetivo: %1" -#: view/RemoteObjectNameWidget.cpp:170 +#: view/RemoteObjectNameWidget.cpp:205 msgctxt "@title" msgid "Can't communicate with the target application" msgstr "No se puede comunicar con la aplicación objetivo" +#: view/RemoteObjectNameWidget.cpp:212 +msgctxt "@label" +msgid "" +"There is no unique name for the chosen object (at least, in the current " +"state of the target application), so it is not possible to refer to that " +"object in a tutorial. The target application must be modified to provide a " +"unique name for that object." +msgstr "" +"No existe un nombre único para el objeto escogido (al menos, en el estado " +"actual de la aplicación objetivo), por lo que no es posible referirse a " +"dicho objeto desde un tutorial. La aplicación objetivo debe modificarse para " +"asignarle un nombre único a dicho objeto." + +#: view/RemoteObjectNameWidget.cpp:216 +msgctxt "@title" +msgid "The chosen object has no unique name" +msgstr "El objeto escogido no tiene un nombre único" + #: view/RemoteObjectTreeItem.cpp:41 view/RemoteObjectTreeItem.cpp:42 msgctxt "@item" msgid "D-Bus Error!" Modified: trunk/ktutorial/ktutorial-editor/po/ktutorial-editor.pot =================================================================== --- trunk/ktutorial/ktutorial-editor/po/ktutorial-editor.pot 2012-08-20 11:15:55 UTC (rev 373) +++ trunk/ktutorial/ktutorial-editor/po/ktutorial-editor.pot 2012-08-20 11:16:43 UTC (rev 374) @@ -9,10 +9,11 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?" "group_id=301227&atid=1270278\n" -"POT-Creation-Date: 2011-06-15 15:24+0200\n" +"POT-Creation-Date: 2012-08-20 13:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -339,7 +340,7 @@ #: main.cpp:32 msgctxt "@info:credit" -msgid "Copyright (c) 2010 Daniel Calviño Sánchez" +msgid "Copyright (c) 2010-2012 Daniel Calviño Sánchez" msgstr "" #: main.cpp:33 @@ -769,7 +770,7 @@ msgstr "" #: tutorials/InteractingWithTheTargetApplication.js:92 -#: tutorials/InteractingWithTheTargetApplication.js:373 +#: tutorials/InteractingWithTheTargetApplication.js:375 msgctxt "@info" msgid "" "<para>Set the trigger type to <link url=\"widget:triggerConditionRadioButton" @@ -777,7 +778,7 @@ msgstr "" #: tutorials/InteractingWithTheTargetApplication.js:106 -#: tutorials/InteractingWithTheTargetApplication.js:387 +#: tutorials/InteractingWithTheTargetApplication.js:389 msgctxt "@info" msgid "" "<para><link url=\"widget:addButton\"><interface>Add</interface></link> a new " @@ -798,15 +799,15 @@ msgstr "" #: tutorials/InteractingWithTheTargetApplication.js:141 -#: tutorials/InteractingWithTheTargetApplication.js:422 +#: tutorials/InteractingWithTheTargetApplication.js:424 msgctxt "@info" msgid "" -"<para><link url=\"widget:okButton\">Accept the dialog</link> to add the " -"condition to wait for.</para>" +"<para><link url=\"widget:addWaitForDialog/okButton\">Accept the dialog</" +"link> to add the condition to wait for.</para>" msgstr "" #: tutorials/InteractingWithTheTargetApplication.js:155 -#: tutorials/InteractingWithTheTargetApplication.js:436 +#: tutorials/InteractingWithTheTargetApplication.js:438 msgctxt "@info" msgid "" "<para>Select the condition just added and <link url=\"widget:editButton" @@ -871,7 +872,13 @@ "tutorial :P</para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:213 +#: tutorials/InteractingWithTheTargetApplication.js:204 +#: tutorials/InteractingWithTheTargetApplication.js:217 +msgctxt "@action Tutorial option" +msgid "Continue" +msgstr "" + +#: tutorials/InteractingWithTheTargetApplication.js:214 msgctxt "@info" msgid "" "<para>Now you have the list with the objects that KTutorial can access in " @@ -897,7 +904,7 @@ "button to set the information of the tutorial will be highlighted.</para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:225 +#: tutorials/InteractingWithTheTargetApplication.js:227 msgctxt "@info" msgid "" "<para>You may have noticed that the list does not contain the object we are " @@ -913,17 +920,18 @@ "it is the dialog that has just been shown.</para>\n" "\n" "<para>Select the <emphasis>StepDataDialog</emphasis> element in the list and " -"<link url=\"widget:okButton\">accept the dialog</link>.</para>" +"<link url=\"widget:RemoteObjectChooser/okButton\">accept the dialog</link>.</" +"para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:239 +#: tutorials/InteractingWithTheTargetApplication.js:241 msgctxt "@info" msgid "" -"<para>Now that the name of the window was set <link url=\"widget:okButton" -"\">accept the dialog</link>.</para>" +"<para>Now that the name of the window was set <link url=\"widget:" +"editWaitForWindowDialog/okButton\">accept the dialog</link>.</para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:253 +#: tutorials/InteractingWithTheTargetApplication.js:255 msgctxt "@info" msgid "" "<para>We want to change to another step when the window is shown, so now it " @@ -933,17 +941,17 @@ "link> to <emphasis>acceptDialog</emphasis>.</para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:274 -#: tutorials/InteractingWithTheTargetApplication.js:345 -#: tutorials/InteractingWithTheTargetApplication.js:562 -#: tutorials/InteractingWithTheTargetApplication.js:632 +#: tutorials/InteractingWithTheTargetApplication.js:276 +#: tutorials/InteractingWithTheTargetApplication.js:347 +#: tutorials/InteractingWithTheTargetApplication.js:564 +#: tutorials/InteractingWithTheTargetApplication.js:634 msgctxt "@info" msgid "" "<para>And finally <link url=\"widget:okButton\">accept the dialog</link>.</" "para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:288 +#: tutorials/InteractingWithTheTargetApplication.js:290 msgctxt "@info" msgid "" "<para>We are done with the first step. Now we will take care of the second " @@ -953,14 +961,14 @@ "addStepToolButton\">add a new step</link>.</para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:302 +#: tutorials/InteractingWithTheTargetApplication.js:304 msgctxt "@info" msgid "" "<para>Set the <link url=\"widget:idLineEdit\">id of the step</link> to " "<emphasis>acceptDialog</emphasis>.</para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:323 +#: tutorials/InteractingWithTheTargetApplication.js:325 msgctxt "@info" msgid "" "<para>Set the <link url=\"widget:textTextEdit\">text of the step</link> to:</" @@ -974,20 +982,20 @@ "area, you don't need to write it yourself.</para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:336 +#: tutorials/InteractingWithTheTargetApplication.js:338 msgid "" "Set the id to <emphasis>start</emphasis> and the text to <" "emphasis>First step</emphasis>, then accept the dialog." msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:359 +#: tutorials/InteractingWithTheTargetApplication.js:361 msgctxt "@info" msgid "" "<para>Now, select the <emphasis>acceptDialog</emphasis> step and add a new " "reaction to it.</para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:401 +#: tutorials/InteractingWithTheTargetApplication.js:403 msgctxt "@info" msgid "" "<para>To wait for the user to accept the dialog we will wait for the user to " @@ -998,12 +1006,12 @@ "\"widget:waitForTypeComboBox\">combo box</link>.</para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:413 rc.cpp:49 +#: tutorials/InteractingWithTheTargetApplication.js:415 rc.cpp:49 msgctxt "@item:inlistbox" msgid "The specified signal is emitted" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:450 +#: tutorials/InteractingWithTheTargetApplication.js:452 msgctxt "@info" msgid "" "<para>We are again in a point where we need to know the name of an object, " @@ -1024,7 +1032,7 @@ "\">emitter name field</link> and watch the completion list pop up.</para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:471 +#: tutorials/InteractingWithTheTargetApplication.js:473 msgctxt "@info" msgid "" "<para>As you can see, the completion list proposes <emphasis>okButton</" @@ -1039,7 +1047,7 @@ "down keys pressing enter when you reach the desired one.</para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:492 +#: tutorials/InteractingWithTheTargetApplication.js:494 msgctxt "@info" msgid "" "<para>The signal name field also provides completion when the target " @@ -1053,7 +1061,7 @@ "button.</para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:506 +#: tutorials/InteractingWithTheTargetApplication.js:508 msgctxt "@info" msgid "" "<para>As it was explained before, we want to react when the <interface>Ok</" @@ -1061,14 +1069,14 @@ "signal from the completion list.</para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:527 +#: tutorials/InteractingWithTheTargetApplication.js:529 msgctxt "@info" msgid "" "<para>Now that the emitter and signal names were set <link url=\"widget:" -"okButton\">accept the dialog</link>.</para>" +"editWaitForSignalDialog/okButton\">accept the dialog</link>.</para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:541 +#: tutorials/InteractingWithTheTargetApplication.js:543 msgctxt "@info" msgid "" "<para>The user accepting the dialog to add a new step will make our example " @@ -1078,7 +1086,7 @@ "link> to <emphasis>end</emphasis>.</para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:576 +#: tutorials/InteractingWithTheTargetApplication.js:578 msgctxt "@info" msgid "" "<para>The last step in the tutorial will just inform the user that the " @@ -1088,14 +1096,14 @@ "addStepToolButton\">adding a new step</link>.</para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:590 +#: tutorials/InteractingWithTheTargetApplication.js:592 msgctxt "@info" msgid "" "<para>Set the <link url=\"widget:idLineEdit\">id of the step</link> to " "<emphasis>end</emphasis>.</para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:611 +#: tutorials/InteractingWithTheTargetApplication.js:613 msgctxt "@info" msgid "" "<para>Set the <link url=\"widget:textTextEdit\">text of the step</link> to:</" @@ -1104,11 +1112,11 @@ "<para><emphasis>And that's all!</emphasis></para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:623 +#: tutorials/InteractingWithTheTargetApplication.js:625 msgid "And that's all!" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:646 +#: tutorials/InteractingWithTheTargetApplication.js:648 msgctxt "@info" msgid "" "<para>Well, now that we have added that last step the example tutorial is " @@ -1131,7 +1139,7 @@ "toolbar.</para>" msgstr "" -#: tutorials/InteractingWithTheTargetApplication.js:660 +#: tutorials/InteractingWithTheTargetApplication.js:662 msgctxt "@info" msgid "" "<para>The tutorial shown in the target application is the one we have been " @@ -1232,18 +1240,32 @@ msgid "<application>KTutorial editor</application> windows will be hidden" msgstr "" -#: view/RemoteObjectNameWidget.cpp:168 +#: view/RemoteObjectNameWidget.cpp:203 msgctxt "@label" msgid "" "The object name can not be set, there was a problem getting the name from " "the target application: %1" msgstr "" -#: view/RemoteObjectNameWidget.cpp:170 +#: view/RemoteObjectNameWidget.cpp:205 msgctxt "@title" msgid "Can't communicate with the target application" msgstr "" +#: view/RemoteObjectNameWidget.cpp:212 +msgctxt "@label" +msgid "" +"There is no unique name for the chosen object (at least, in the current " +"state of the target application), so it is not possible to refer to that " +"object in a tutorial. The target application must be modified to provide a " +"unique name for that object." +msgstr "" + +#: view/RemoteObjectNameWidget.cpp:216 +msgctxt "@title" +msgid "The chosen object has no unique name" +msgstr "" + #: view/RemoteObjectTreeItem.cpp:41 view/RemoteObjectTreeItem.cpp:42 msgctxt "@item" msgid "D-Bus Error!" Modified: trunk/ktutorial/ktutorial-library/po/es.po =================================================================== -... [truncated message content] |
From: <dan...@us...> - 2012-08-20 11:16:02
|
Revision: 373 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=373&view=rev Author: danxuliu Date: 2012-08-20 11:15:55 +0000 (Mon, 20 Aug 2012) Log Message: ----------- Update English handbook. Modified Paths: -------------- trunk/ktutorial/ktutorial-editor/doc/en/index.docbook trunk/ktutorial/ktutorial-editor/doc/en/installation.docbook trunk/ktutorial/ktutorial-editor/doc/en/using.docbook Modified: trunk/ktutorial/ktutorial-editor/doc/en/index.docbook =================================================================== --- trunk/ktutorial/ktutorial-editor/doc/en/index.docbook 2012-08-20 10:59:41 UTC (rev 372) +++ trunk/ktutorial/ktutorial-editor/doc/en/index.docbook 2012-08-20 11:15:55 UTC (rev 373) @@ -35,6 +35,8 @@ <copyright> <year>2010</year> + <year>2011</year> + <year>2012</year> <holder>Daniel Calviño Sánchez</holder> </copyright> <!-- Translators: put here the copyright notice of the translation --> @@ -49,8 +51,8 @@ (V.MM.LL), it could be used by automation scripts. Do NOT change these in the translation. --> - <date>2010-03-23</date> - <releaseinfo>0.1</releaseinfo> + <date>2012-08-18</date> + <releaseinfo>0.5</releaseinfo> <!-- Abstract about this handbook --> @@ -92,11 +94,11 @@ &ktutorial-editor; </para> <para> - Program Copyright 2010 Daniel Calviño Sánchez <email>dan...@gm...</email> + Program Copyright 2010-2012 Daniel Calviño Sánchez <email>dan...@gm...</email> </para> <para> - Documentation Copyright 2010 Daniel Calviño Sánchez <email>dan...@gm...</email> + Documentation Copyright 2010-2012 Daniel Calviño Sánchez <email>dan...@gm...</email> </para> <!-- TRANS:CREDIT_FOR_TRANSLATORS --> Modified: trunk/ktutorial/ktutorial-editor/doc/en/installation.docbook =================================================================== --- trunk/ktutorial/ktutorial-editor/doc/en/installation.docbook 2012-08-20 10:59:41 UTC (rev 372) +++ trunk/ktutorial/ktutorial-editor/doc/en/installation.docbook 2012-08-20 11:15:55 UTC (rev 373) @@ -22,7 +22,7 @@ <sect1 id="requirements"> <title>Requirements</title> - <para>In order to successfully build and use KTutorial, you need &kde; (at least version 4.3) and, therefore, &Qt; (at least version 4.5.3).</para> + <para>In order to successfully build and use KTutorial, you need &kde; (at least version 4.3) and, therefore, &Qt; (at least version 4.6).</para> <para>To use the full feature set of &ktutorial-editor; you will also need the QtDBus module of Qt, only available in Unix systems. Without that module &ktutorial-editor; can not talk to the target application, for example to know the name of its objects.</para> Modified: trunk/ktutorial/ktutorial-editor/doc/en/using.docbook =================================================================== --- trunk/ktutorial/ktutorial-editor/doc/en/using.docbook 2012-08-20 10:59:41 UTC (rev 372) +++ trunk/ktutorial/ktutorial-editor/doc/en/using.docbook 2012-08-20 11:15:55 UTC (rev 373) @@ -223,7 +223,8 @@ <title>Objects with duplicated names</title> <para>Usually, the name of an object in the target application will identify that and only that object. However, sometimes there could be two or more objects with the same name. For example, if there are two or more dialogs opened, there will probably be two or more objects named <literal>Ok button</literal>.</para> <para>Therefore, when two or more objects have the same name, they can not be identified by their name alone. Instead, their name must be qualified with the name of one or more ancestor objects. For example, <literal>Configuration dialog/Ok button</literal>. When an object is chosen in the list, &ktutorial-editor; takes care of all this and gets a unique name for the object.</para> - <para>But note that a name and the object it represents depends on the state of the target application. For example, if there is a dialog named <literal>Configuration dialog</literal> with a button named <literal>Ok button</literal>, its unique name could be just <literal>Ok button</literal>. However, if another dialog named <literal>File information dialog</literal> were opened while the <literal>Configuration dialog</literal> was still opened, and <literal>File information dialog</literal> had a also button called <literal>Ok button</literal>, now the unique name of the first button would be <literal>Configuration dialog/Ok button</literal>. In this situation, <literal>Ok button</literal> would not represent a specific object in the target application.</para> + <para>Under some circumstances, an object may not have a unique name. When a name represents two or more objects, KTutorial applies a set of ambiguity solving rules. &ktutorial-editor; takes that into account too, and tries to get a name that identifies the chosen object, even if the name is not unique. But, if even after applying the ambiguity solving rules there is no name that identifies just the chosen object, a warning is shown.</para> + <para>However, note that a name and the object it represents depends on the state of the target application. For example, if there is a dialog named <literal>Configuration dialog</literal> with a button named <literal>Ok button</literal>, its unique name could be just <literal>Ok button</literal>. However, if another dialog named <literal>File information dialog</literal> were opened while the <literal>Configuration dialog</literal> was still opened, and <literal>File information dialog</literal> had a also button called <literal>Ok button</literal>, now the unique name of the first button would be <literal>Configuration dialog/Ok button</literal>. In this situation, <literal>Ok button</literal> would not represent a specific object in the target application.</para> <para>All that means that, when choosing an object from the target application, the target application should be in the same state as it would be when following the tutorial and getting to the current step.</para> </tip> </sect2> @@ -240,7 +241,7 @@ <title>Other less noticeable features</title> <para>Besides those already mentioned, &ktutorial-editor; uses a running target application to provide other small yet useful features.</para> - <para>The one-line text editors to set the name of an object have text completion, so if instead of choosing the object its name is written directly in the text editor it will suggest the name based on the objects in the target application.</para> + <para>The one-line text editors to set the name of an object have text completion, so if instead of choosing the object its name is written directly in the text editor it will suggest the name based on the objects in the target application. The completion will try to suggest unique names; however, two or more proposed names can be duplicated if the objects they represent do not have a unique name, even after applying the ambiguity solving rules.</para> <para>The one-line text editor to set the name of a signal also has text completion, so when the object name was set, the text editor will suggest the signal name based on the signals that can be emitted by that object. The same schema is used for the name of properties.</para> <para>The one-line text editors for step ids in the step data and reaction dialogs have text completion too. The first one will suggest the ids not assigned yet (from the <emphasis>change to step</emphasis> field of the reactions), and the second one will suggest the ids already set in the steps.</para> <para>The text completion uses the standard KDE text completion system, so all the standard keyboard shortcuts can be used (like <keycombo action="simul">&Ctrl;<keycap>T</keycap></keycombo> to show all the available completions).</para> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-08-20 10:59:49
|
Revision: 372 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=372&view=rev Author: danxuliu Date: 2012-08-20 10:59:41 +0000 (Mon, 20 Aug 2012) Log Message: ----------- Add system for the applications using KTutorial to customize its user interface. Modified Paths: -------------- trunk/ktutorial/ktutorial-library/src/CMakeLists.txt trunk/ktutorial/ktutorial-library/src/KTutorial.cpp trunk/ktutorial/ktutorial-library/src/KTutorial.h trunk/ktutorial/ktutorial-library/src/Option.h trunk/ktutorial/ktutorial-library/src/Tutorial.h trunk/ktutorial/ktutorial-library/src/TutorialManager.h trunk/ktutorial/ktutorial-library/src/WaitForWindow.cpp trunk/ktutorial/ktutorial-library/src/scripting/ScriptingModule.cpp trunk/ktutorial/ktutorial-library/src/tutorials/UsingKTutorial.cpp trunk/ktutorial/ktutorial-library/tests/CMakeLists.txt Added Paths: ----------- trunk/ktutorial/ktutorial-library/src/KTutorialCustomization.cpp trunk/ktutorial/ktutorial-library/src/KTutorialCustomization.h trunk/ktutorial/ktutorial-library/src/customization/ trunk/ktutorial/ktutorial-library/src/customization/CMakeLists.txt trunk/ktutorial/ktutorial-library/src/customization/DefaultKdeCustomization.cpp trunk/ktutorial/ktutorial-library/src/customization/DefaultKdeCustomization.h trunk/ktutorial/ktutorial-library/tests/customization/ trunk/ktutorial/ktutorial-library/tests/customization/CMakeLists.txt trunk/ktutorial/ktutorial-library/tests/customization/DefaultKdeCustomizationTest.cpp Modified: trunk/ktutorial/ktutorial-library/src/CMakeLists.txt =================================================================== --- trunk/ktutorial/ktutorial-library/src/CMakeLists.txt 2012-08-15 02:08:03 UTC (rev 371) +++ trunk/ktutorial/ktutorial-library/src/CMakeLists.txt 2012-08-20 10:59:41 UTC (rev 372) @@ -3,6 +3,7 @@ add_definitions("-fPIC") add_subdirectory(common) +add_subdirectory(customization) add_subdirectory(extendedinformation) add_subdirectory(scripting) add_subdirectory(tutorials) @@ -20,6 +21,7 @@ set(ktutorial_LIB_SRCS KTutorial.cpp + KTutorialCustomization.cpp ObjectFinder.cpp Option.cpp Step.cpp @@ -40,7 +42,7 @@ kde4_add_library(ktutorial SHARED ${ktutorial_LIB_SRCS}) -target_link_libraries(ktutorial ktutorial_scripting ktutorial_tutorials ktutorial_view) +target_link_libraries(ktutorial ktutorial_customization ktutorial_scripting) if (QT_QTDBUS_FOUND) target_link_libraries(ktutorial ktutorial_editorsupport) Modified: trunk/ktutorial/ktutorial-library/src/KTutorial.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/KTutorial.cpp 2012-08-15 02:08:03 UTC (rev 371) +++ trunk/ktutorial/ktutorial-library/src/KTutorial.cpp 2012-08-20 10:59:41 UTC (rev 372) @@ -16,46 +16,23 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#include <kaction.h> -#include <kactioncollection.h> -#include <klocalizedstring.h> - #include "KTutorial.h" -#include "Tutorial.h" -#include "TutorialInformation.h" +#include "customization/DefaultKdeCustomization.h" #include "scripting/ScriptingModule.h" #include "scripting/ScriptManager.h" -#include "tutorials/UsingKTutorial.h" -#include "view/StepWidget.h" -#include "view/TutorialManagerDialog.h" #ifdef QT_QTDBUS_FOUND #include "editorsupport/EditorSupport.h" #endif +using ktutorial::customization::DefaultKdeCustomization; using ktutorial::scripting::ScriptingModule; using ktutorial::scripting::ScriptManager; -using ktutorial::view::StepWidget; -using ktutorial::view::TutorialManagerDialog; namespace ktutorial { //public: -//It inherits from QObject to be automatically destroyed when the parent -//KXmlGuiWindow is destroyed. It uses the same strategy as -//KDEPrivate::ToolBarHandler. -//Usually I do not like multiple inheritance, but it comes very handy here :) -class TutorialKXmlGuiClient: public QObject, public KXMLGUIClient { -Q_OBJECT -public: - TutorialKXmlGuiClient(KXmlGuiWindow* parent): - QObject(parent), KXMLGUIClient(parent) { - setComponentData(KComponentData("ktutorial")); - setXMLFile("ktutorialui.rc"); - } -}; - bool KTutorial::registerWaitForMetaObject(const QMetaObject& waitForMetaObject, const QString& typeName /*= QString()*/) { return ScriptingModule::self()->registerWaitForMetaObject(waitForMetaObject, @@ -63,79 +40,37 @@ } void KTutorial::setup(KXmlGuiWindow* window) { - TutorialKXmlGuiClient* tutorialClient= new TutorialKXmlGuiClient(window); + DefaultKdeCustomization* defaultKdeCustomization = + new DefaultKdeCustomization(window); + setup(defaultKdeCustomization); +} - mTutorialsAction = new KAction(window); - mTutorialsAction->setText(i18nc("@action:inmenu", "Tutorials...")); - tutorialClient->actionCollection()->addAction("tutorials", mTutorialsAction); - connect(mTutorialsAction, SIGNAL(triggered(bool)), - this, SLOT(showTutorialManagerDialog())); +void KTutorial::setup(KTutorialCustomization* ktutorialCustomization) { + mCustomization = ktutorialCustomization; + mCustomization->setParent(this); - connect(mTutorialmanager, SIGNAL(started(Tutorial*)), - this, SLOT(showStepWidget(Tutorial*))); + mCustomization->setup(mTutorialmanager); - connect(mTutorialmanager, SIGNAL(started(Tutorial*)), - this, SLOT(disableTutorialsAction())); - connect(mTutorialmanager, SIGNAL(finished()), - this, SLOT(enableTutorialsAction())); - - mParent = window; - - registerTutorial(new UsingKTutorial()); - ScriptManager().loadTutorials(mTutorialmanager); #ifdef QT_QTDBUS_FOUND editorsupport::EditorSupport* editorSupport = new editorsupport::EditorSupport(this); editorSupport->setObjectFinder(mObjectFinder); - editorSupport->setup(window); + editorSupport->setup(mainApplicationWindow()); connect(editorSupport, SIGNAL(started(Tutorial*)), - this, SLOT(showStepWidget(Tutorial*))); + ktutorialCustomization, SLOT(showTutorialUI(Tutorial*))); #endif } +QWidget* KTutorial::mainApplicationWindow() const { + return mCustomization->mainApplicationWindow(); +} + //private: KTutorial* KTutorial::sSelf = new KTutorial(); -//private slots: - -void KTutorial::showTutorialManagerDialog() const { - QDialog* dialog = new TutorialManagerDialog(mTutorialmanager, mParent); - dialog->setAttribute(Qt::WA_DeleteOnClose); - dialog->setModal(true); - dialog->setObjectName("ktutorial_TutorialManagerDialog"); - - dialog->show(); } -void KTutorial::showStepWidget(Tutorial* tutorial) const { - QString tutorialName = tutorial->tutorialInformation()->name(); - - StepWidget* stepWidget = new StepWidget(tutorialName, mParent); - stepWidget->setMainApplicationWindow(mParent); - stepWidget->setObjectName("ktutorial_StepWidget"); - connect(tutorial, SIGNAL(stepActivated(Step*)), - stepWidget, SLOT(setStep(Step*))); - connect(stepWidget, SIGNAL(finished()), tutorial, SLOT(finish())); - //Invalid tutorials finish just after being started. Deleting the StepWidget - //when the tutorial finishes ensures that it is deleted in those cases and, - //as deleteLater() is used, it does not interfere with the deletion when the - //StepWidget is closed by the user. - connect(tutorial, SIGNAL(finished(Tutorial*)), - stepWidget, SLOT(deleteLater())); -} - -void KTutorial::disableTutorialsAction() { - mTutorialsAction->setEnabled(false); -} - -void KTutorial::enableTutorialsAction() { - mTutorialsAction->setEnabled(true); -} - -} - -#include "moc_KTutorial.cpp" #include "KTutorial.moc" Modified: trunk/ktutorial/ktutorial-library/src/KTutorial.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/KTutorial.h 2012-08-15 02:08:03 UTC (rev 371) +++ trunk/ktutorial/ktutorial-library/src/KTutorial.h 2012-08-20 10:59:41 UTC (rev 372) @@ -19,27 +19,35 @@ #ifndef KTUTORIAL_KTUTORIAL_H #define KTUTORIAL_KTUTORIAL_H -#include <kxmlguiwindow.h> +#include <QWidget> #include "ktutorial_export.h" #include "ObjectFinder.h" #include "TutorialManager.h" -class KAction; +class KXmlGuiWindow; namespace ktutorial { +class KTutorialCustomization; +} +namespace ktutorial { + /** * Main class of KTutorial. * This class is used to setup KTutorial, register WaitFor classes to be created * from scripts, register new Tutorials embedded in the application and find * objects in the Tutorials. It uses a Singleton design pattern. * - * When using KTutorial, KTutorial::setup(KxmlGuiWindow*) must be called to set - * up everything needed for KTutorial to work. It needs to know the main window - * of the application. + * When using KTutorial and no customization is needed, + * KTutorial::setup(KxmlGuiWindow*) must be called to set up everything needed + * for KTutorial to work. It needs to know the main window of the application. * + * If a KTutorial customization is needed, + * KTutorial::setup(KTutorialCustomization*) must be called instead providing + * the desired customization. + * * The setup method will be the first one to be called, but when custom WaitFor * objects are used in scripts. In that case, all the needed WaitFor classes * must be registered using registerWaitForMetaObject(const QMetaObject&) before @@ -50,14 +58,18 @@ * Just use KTutorial::registerTutorial(Tutorial*) so it is registered in the * system. Only registered tutorial are seen by the user. * - * Finally, any of the children objects of the main window of the application - * (which will usually be at least all widgets) can be got with - * KTutorial::findObject(const QString&), provided the looked for object has its - * object name set. + * Note, however, that when a customization is used, the WaitFor classes and the + * tutorials embedded in the application can be registered during the + * customization setup itself. * - * The TutorialManagerDialog is shown as modal through the "tutorials" action in - * Help menu. This action will be automatically disabled whenever a tutorial is - * being executed. + * When no customization is used, the TutorialManagerDialog is shown as modal + * through the "tutorials" action in the "Help" menu. This action will be + * automatically disabled whenever a tutorial is being executed. + * + * Finally, no matter whether a customization is used or not, any of the + * children objects of the main window of the application (which will usually be + * at least all widgets) can be got with KTutorial::findObject(const QString&), + * provided the looked for object has its object name set. */ class KTUTORIAL_EXPORT KTutorial: public QObject { Q_OBJECT @@ -86,10 +98,10 @@ const QString& typeName = QString()); /** - * Sets up everything for KTutorial to work. - * This is usually the first method that must be called when using KTutorial - * in an application. However, if any WaitFor class has to be registered, it - * must be done before calling this method. + * Sets up everything for KTutorial to work with the default customization. + * If no customization is needed, this is usually the first method that must + * be called when using KTutorial in an application. However, if any WaitFor + * class has to be registered, it must be done before calling this method. * * It adds the Tutorials action and the menu entry for it in Help menu and * loads the scripted tutorials from the application standard directories. @@ -99,6 +111,15 @@ void setup(KXmlGuiWindow* window); /** + * Sets up everything for KTutorial to work with the given customization. + * After setting up the customization, it loads the scripted tutorials from + * the application standard directories. + * + * @param ktutorialCustomization The customization to use. + */ + void setup(KTutorialCustomization* ktutorialCustomization); + + /** * Registers the Tutorial. * Only Tutorials with a identifier not added yet can be added. If the * Tutorial couldn't be added, false is returned. @@ -113,14 +134,11 @@ } /** - * Returns the parent widget. - * It is the main window of the application. + * Returns the main window of the application. * - * @return The parent widget. + * @return The main window of the application. */ - KXmlGuiWindow* parentWidget() const { - return mParent; - } + QWidget* mainApplicationWindow() const; /** * Returns the object with the specified name, if any. @@ -174,7 +192,7 @@ */ template <typename T> T findObject(const QString& name) const { - return mObjectFinder->findObject<T>(name, mParent); + return mObjectFinder->findObject<T>(name, mainApplicationWindow()); } private: @@ -190,62 +208,26 @@ TutorialManager* mTutorialmanager; /** - * The parent widget of the TutorialManagerDialog to show. + * The helper used to find objects. */ - KXmlGuiWindow* mParent; + ObjectFinder* mObjectFinder; /** - * The KAction to show the TutorialManagerDialog. + * The KTutorialCustomization used. */ - KAction* mTutorialsAction; + KTutorialCustomization* mCustomization; /** - * The helper used to find objects. - */ - ObjectFinder* mObjectFinder; - - /** * Creates a new KTutorial. * Private to avoid classes other than self to create instances. */ - KTutorial(): QObject(), + KTutorial(): mTutorialmanager(new TutorialManager()) { mTutorialmanager->setParent(this); - mTutorialsAction = 0; - mParent = 0; mObjectFinder = new ObjectFinder(this); + mCustomization = 0; } -private slots: - - /** - * Shows a modal TutorialManagerDialog. - * Called when the tutorials action is triggered. - */ - void showTutorialManagerDialog() const; - - /** - * Shows the GUI for the given Tutorial. - * Called when the tutorial is about to be started. - * - * @param tutorial The tutorial to show its StepWidget. - */ - void showStepWidget(Tutorial* tutorial) const; - - /** - * Disables mTutorialsAction. - * Just a wrapper to be connected with signals that can't pass false to the - * setEnabled(bool) slot. - */ - void disableTutorialsAction(); - - /** - * Enables mTutorialsAction. - * Just a wrapper to be connected with signals that can't pass true to the - * setEnabled(bool) slot. - */ - void enableTutorialsAction(); - }; } Added: trunk/ktutorial/ktutorial-library/src/KTutorialCustomization.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/KTutorialCustomization.cpp (rev 0) +++ trunk/ktutorial/ktutorial-library/src/KTutorialCustomization.cpp 2012-08-20 10:59:41 UTC (rev 372) @@ -0,0 +1,21 @@ +/*************************************************************************** + * Copyright (C) 2012 by Daniel Calviño Sánchez * + * dan...@gm... * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; If not, see <http://www.gnu.org/licenses/>. * + ***************************************************************************/ + +#include "KTutorialCustomization.h" + +#include "KTutorialCustomization.moc" Property changes on: trunk/ktutorial/ktutorial-library/src/KTutorialCustomization.cpp ___________________________________________________________________ Added: svn:eol-style + native Added: trunk/ktutorial/ktutorial-library/src/KTutorialCustomization.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/KTutorialCustomization.h (rev 0) +++ trunk/ktutorial/ktutorial-library/src/KTutorialCustomization.h 2012-08-20 10:59:41 UTC (rev 372) @@ -0,0 +1,110 @@ +/*************************************************************************** + * Copyright (C) 2012 by Daniel Calviño Sánchez * + * dan...@gm... * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; If not, see <http://www.gnu.org/licenses/>. * + ***************************************************************************/ + +#ifndef KTUTORIAL_KTUTORIALCUSTOMIZATION_H +#define KTUTORIAL_KTUTORIALCUSTOMIZATION_H + +#include <QObject> + +#include "ktutorial_export.h" + +namespace ktutorial { +class Tutorial; +class TutorialManager; +} + +namespace ktutorial { + +/** + * Interface to customize the UI of KTutorial. + * The classes that implement this interface are used by KTutorial to set up its + * user interface. You can provide your own class to KTutorial through + * KTutorial::setup(KTutorialCustomization*) to control the user interface for + * the tutorial manager and the tutorials. + * + * As this is an interface, all its methods must be implemented. + * + * Besides implementing the methods, you must provide your own classes for the + * tutorial manager and tutorial UIs. The tutorial manager UI must call the + * TutorialManager::start(QString) with the id of the tutorial to be started. If + * you need to know when the tutorial finishes (for example, to show again the + * tutorial manager UI, or to know when the tutorial UI is no longer needed), + * you can connect to the TutorialManager::finished() or the + * Tutorial::finished(Tutorial*) signals. Anyway, the tutorial UI must call + * Tutorial::finish() when the user finishes the tutorial from the UI. The + * tutorial UI must also emit the appropriate Option::selected() (connecting it + * to another signal) when the user selects an option in the UI. Finally, the + * tutorial UI must connect to the Tutorial::stepActivated(Step*) to know when + * a new step has to be shown. + * + * If you do not want to implement your own KTutorial user interface just use + * the default one for KDE through KTutorial::setup(KXmlGuiWindow*). + */ +class KTUTORIAL_EXPORT KTutorialCustomization: public QObject { +Q_OBJECT +public: + + /** + * Sets up the KTutorial user interface. + * This method will be called before loading the scripted tutorials, and + * before setting up the editor support (if available). + * + * Two things must be done in this method: preparing the user interface for + * the tutorial manager, and preparing the user interface for the tutorials. + * Note that preparing the UI for the tutorial manager also implies setting + * up a method to show the UI itself, for example, through a menu item. + * Also, to show the tutorial UI when a tutorial is started you can just + * connect the TutorialManager::started(Tutorial*) signal with the + * showTutorialUI(Tutorial*) slot in the KTutorialCustomization implementing + * class. + * + * Besides setting up the user interface, you may also register meta objects + * and tutorials here if needed. + * + * @param tutorialManager The TutorialManager used by KTutorial. + */ + virtual void setup(TutorialManager* tutorialManager) = 0; + + /** + * Returns the main window of the application. + * + * @return The main window of the application. + */ + virtual QWidget* mainApplicationWindow() = 0; + +public slots: + + /** + * Shows the tutorial UI. + * This method is used by KTutorial to show the UI of a tutorial when tested + * from the editor. + * + * Of course, it can be used when showing regular tutorials too, but it is + * the KTutorialCustomization implementing class the one which must call + * this method when needed, for example, connecting the slot to the + * started(Tutorial*) signal of the TutorialManager. + * + * @param tutorial The tutorial to show its UI. + */ + virtual void showTutorialUI(Tutorial* tutorial) = 0; + +}; + +} + +#endif Property changes on: trunk/ktutorial/ktutorial-library/src/KTutorialCustomization.h ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/ktutorial/ktutorial-library/src/Option.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/Option.h 2012-08-15 02:08:03 UTC (rev 371) +++ trunk/ktutorial/ktutorial-library/src/Option.h 2012-08-20 10:59:41 UTC (rev 372) @@ -74,8 +74,10 @@ /** * This signal is emitted when this Option is selected by the user. - * Don't connect nor emit this signal yourself. It is connected - * automatically by KTutorial. + * + * If a KTutorial customization is used, you must emit this signal + * (connecting it to another signal) when the user selects the option in the + * UI. */ void selected(); Modified: trunk/ktutorial/ktutorial-library/src/Tutorial.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/Tutorial.h 2012-08-15 02:08:03 UTC (rev 371) +++ trunk/ktutorial/ktutorial-library/src/Tutorial.h 2012-08-20 10:59:41 UTC (rev 372) @@ -151,8 +151,8 @@ * The current step is deactivated, this tutorial is cleaned, and finished * signal is emitted. * - * This slot is used internally. Do not call or connect to this slot - * yourself. + * If a KTutorial customization is used, this method must be called when the + * user finished the tutorial from the UI. */ void finish(); @@ -160,18 +160,20 @@ /** * This signal is emitted when this Tutorial finishes. - * Don't connect nor emit this signal yourself. It is connected - * automatically by KTutorial. * + * If a KTutorial customization is used, you may connect to this signal to + * know when the tutorial UI is no longer needed. + * * @param tutorial This tutorial. */ void finished(Tutorial* tutorial); /** * This signal is emitted when a Step is activated. - * Don't connect nor emit this signal yourself. It is connected - * automatically by KTutorial. * + * If a KTutorial customization is used, you must connect to this signal to + * know when the tutorial UI has to show a new step. + * * @param step The activated Step. */ void stepActivated(Step* step); Modified: trunk/ktutorial/ktutorial-library/src/TutorialManager.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/TutorialManager.h 2012-08-15 02:08:03 UTC (rev 371) +++ trunk/ktutorial/ktutorial-library/src/TutorialManager.h 2012-08-20 10:59:41 UTC (rev 372) @@ -84,6 +84,9 @@ * emitted if there is no tutorial with the specified id. In this case, no * tutorial is started. * + * If a KTutorial customization is used, this method must be called when the + * tutorial has to be started. + * * @param id The id of the tutorial. */ void start(const QString& id); Modified: trunk/ktutorial/ktutorial-library/src/WaitForWindow.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForWindow.cpp 2012-08-15 02:08:03 UTC (rev 371) +++ trunk/ktutorial/ktutorial-library/src/WaitForWindow.cpp 2012-08-20 10:59:41 UTC (rev 372) @@ -30,7 +30,7 @@ mConditionMet(false) { WindowVisibilitySpy* spy = new WindowVisibilitySpy(this); - spy->addWidgetToSpy(KTutorial::self()->parentWidget()); + spy->addWidgetToSpy(KTutorial::self()->mainApplicationWindow()); connect(spy, SIGNAL(windowShown(QWidget*)), this, SLOT(checkWindowShown(QWidget*))); } @@ -39,7 +39,7 @@ mConditionMet(false) { WindowVisibilitySpy* spy = new WindowVisibilitySpy(this); - spy->addWidgetToSpy(KTutorial::self()->parentWidget()); + spy->addWidgetToSpy(KTutorial::self()->mainApplicationWindow()); connect(spy, SIGNAL(windowShown(QWidget*)), this, SLOT(checkWindowShown(QWidget*))); Added: trunk/ktutorial/ktutorial-library/src/customization/CMakeLists.txt =================================================================== --- trunk/ktutorial/ktutorial-library/src/customization/CMakeLists.txt (rev 0) +++ trunk/ktutorial/ktutorial-library/src/customization/CMakeLists.txt 2012-08-20 10:59:41 UTC (rev 372) @@ -0,0 +1,9 @@ +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES}) + +set(ktutorial_customization_SRCS + DefaultKdeCustomization.cpp +) + +kde4_add_library(ktutorial_customization ${ktutorial_customization_SRCS}) + +target_link_libraries(ktutorial_customization ktutorial_tutorials ktutorial_view) Property changes on: trunk/ktutorial/ktutorial-library/src/customization/CMakeLists.txt ___________________________________________________________________ Added: svn:eol-style + native Added: trunk/ktutorial/ktutorial-library/src/customization/DefaultKdeCustomization.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/customization/DefaultKdeCustomization.cpp (rev 0) +++ trunk/ktutorial/ktutorial-library/src/customization/DefaultKdeCustomization.cpp 2012-08-20 10:59:41 UTC (rev 372) @@ -0,0 +1,125 @@ +/*************************************************************************** + * Copyright (C) 2012 by Daniel Calviño Sánchez * + * dan...@gm... * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; If not, see <http://www.gnu.org/licenses/>. * + ***************************************************************************/ + +#include <KAction> +#include <KActionCollection> +#include <KLocalizedString> + +#include "DefaultKdeCustomization.h" +#include "../Tutorial.h" +#include "../TutorialInformation.h" +#include "../TutorialManager.h" +#include "../tutorials/UsingKTutorial.h" +#include "../view/StepWidget.h" +#include "../view/TutorialManagerDialog.h" + +using ktutorial::view::StepWidget; +using ktutorial::view::TutorialManagerDialog; + +namespace ktutorial { +namespace customization { + +//public: + +//It inherits from QObject to be automatically destroyed when the parent +//KXmlGuiWindow is destroyed. It uses the same strategy as +//KDEPrivate::ToolBarHandler. +//Usually I do not like multiple inheritance, but it comes very handy here :) +class TutorialKXmlGuiClient: public QObject, public KXMLGUIClient { +Q_OBJECT +public: + TutorialKXmlGuiClient(KXmlGuiWindow* parent): + QObject(parent), KXMLGUIClient(parent) { + setComponentData(KComponentData("ktutorial")); + setXMLFile("ktutorialui.rc"); + } +}; + +DefaultKdeCustomization::DefaultKdeCustomization(KXmlGuiWindow* window): + mWindow(window) { +} + +void DefaultKdeCustomization::setup(TutorialManager* tutorialManager) { + mTutorialManager = tutorialManager; + + TutorialKXmlGuiClient* tutorialClient= new TutorialKXmlGuiClient(mWindow); + + mTutorialsAction = new KAction(mWindow); + mTutorialsAction->setText(i18nc("@action:inmenu", "Tutorials...")); + tutorialClient->actionCollection()->addAction("tutorials", mTutorialsAction); + connect(mTutorialsAction, SIGNAL(triggered(bool)), + this, SLOT(showTutorialManagerDialog())); + + connect(mTutorialManager, SIGNAL(started(Tutorial*)), + this, SLOT(showTutorialUI(Tutorial*))); + + connect(mTutorialManager, SIGNAL(started(Tutorial*)), + this, SLOT(disableTutorialsAction())); + connect(mTutorialManager, SIGNAL(finished()), + this, SLOT(enableTutorialsAction())); + + mTutorialManager->registerTutorial(new UsingKTutorial()); +} + +QWidget* DefaultKdeCustomization::mainApplicationWindow() { + return mWindow; +} + +//public slots: + +void DefaultKdeCustomization::showTutorialUI(Tutorial* tutorial) { + QString tutorialName = tutorial->tutorialInformation()->name(); + + StepWidget* stepWidget = new StepWidget(tutorialName, mWindow); + stepWidget->setMainApplicationWindow(mWindow); + stepWidget->setObjectName("ktutorial_StepWidget"); + connect(tutorial, SIGNAL(stepActivated(Step*)), + stepWidget, SLOT(setStep(Step*))); + connect(stepWidget, SIGNAL(finished()), tutorial, SLOT(finish())); + //Invalid tutorials finish just after being started. Deleting the StepWidget + //when the tutorial finishes ensures that it is deleted in those cases and, + //as deleteLater() is used, it does not interfere with the deletion when the + //StepWidget is closed by the user. + connect(tutorial, SIGNAL(finished(Tutorial*)), + stepWidget, SLOT(deleteLater())); +} + +//private slots: + +void DefaultKdeCustomization::showTutorialManagerDialog() const { + QDialog* dialog = new TutorialManagerDialog(mTutorialManager, mWindow); + dialog->setAttribute(Qt::WA_DeleteOnClose); + dialog->setModal(true); + dialog->setObjectName("ktutorial_TutorialManagerDialog"); + + dialog->show(); +} + +void DefaultKdeCustomization::disableTutorialsAction() { + mTutorialsAction->setEnabled(false); +} + +void DefaultKdeCustomization::enableTutorialsAction() { + mTutorialsAction->setEnabled(true); +} + +} +} + +#include "moc_DefaultKdeCustomization.cpp" +#include "DefaultKdeCustomization.moc" Property changes on: trunk/ktutorial/ktutorial-library/src/customization/DefaultKdeCustomization.cpp ___________________________________________________________________ Added: svn:eol-style + native Added: trunk/ktutorial/ktutorial-library/src/customization/DefaultKdeCustomization.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/customization/DefaultKdeCustomization.h (rev 0) +++ trunk/ktutorial/ktutorial-library/src/customization/DefaultKdeCustomization.h 2012-08-20 10:59:41 UTC (rev 372) @@ -0,0 +1,128 @@ +/*************************************************************************** + * Copyright (C) 2012 by Daniel Calviño Sánchez * + * dan...@gm... * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; If not, see <http://www.gnu.org/licenses/>. * + ***************************************************************************/ + +#ifndef KTUTORIAL_CUSTOMIZATION_DEFAULTKDECUSTOMIZATION_H +#define KTUTORIAL_CUSTOMIZATION_DEFAULTKDECUSTOMIZATION_H + +#include <KXmlGuiWindow> + +#include "../KTutorialCustomization.h" + +class KAction; + +namespace ktutorial { +namespace customization { + +/** + * Default KTutorial customization for KDE. + * The default customization adds a "Tutorials" menu entry in the "Help" menu + * that shows a TutorialManagerDialog; the tutorial UI shown is a StepWidget. It + * also registers the default tutorial, "Using KTutorial". + * + * Note that the default customization can be used only with XMLGUI applications + * (applications where the main window is a KXmlGuiWindow). In order to add the + * menu entry in the proper place in the menu a change must be done in your + * "applicationnameui.rc". Please refer to KTutorial manual for further + * information. + */ +class DefaultKdeCustomization: public KTutorialCustomization { +Q_OBJECT +public: + + /** + * Creates a new DefaultKdeCustomization for the given window. + * + * @param window The main window of the application. + */ + DefaultKdeCustomization(KXmlGuiWindow* window); + + /** + * Sets up the KTutorial user interface. + * It adds the Tutorials action and the menu entry for it in Help menu, and + * prepares the TutorialManagerDialog and the StepWidget to be shown when + * needed. + * + * Besides setting up the user interface, the default "Using KTutorial" + * tutorial is registered. + * + * @param tutorialManager The TutorialManager used by KTutorial. + */ + virtual void setup(TutorialManager* tutorialManager); + + /** + * Returns the main window of the application. + * + * @return The main window of the application. + */ + virtual QWidget* mainApplicationWindow(); + +public slots: + + /** + * Shows the tutorial UI. + * A StepWidget is used. + * + * @param tutorial The tutorial to show its StepWidget. + */ + virtual void showTutorialUI(Tutorial* tutorial); + +private: + + /** + * The main application window. + */ + KXmlGuiWindow* mWindow; + + /** + * The manager for the tutorials. + */ + TutorialManager* mTutorialManager; + + /** + * The KAction to show the TutorialManagerDialog. + */ + KAction* mTutorialsAction; + +private slots: + + /** + * Shows a modal TutorialManagerDialog. + * Called when the tutorials action is triggered. + */ + void showTutorialManagerDialog() const; + + /** + * Disables mTutorialsAction. + * Just a wrapper to be connected with signals that can't pass false to the + * setEnabled(bool) slot. + */ + void disableTutorialsAction(); + + /** + * Enables mTutorialsAction. + * Just a wrapper to be connected with signals that can't pass true to the + * setEnabled(bool) slot. + */ + void enableTutorialsAction(); + +}; + +} +} + +#endif Property changes on: trunk/ktutorial/ktutorial-library/src/customization/DefaultKdeCustomization.h ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/ktutorial/ktutorial-library/src/scripting/ScriptingModule.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/scripting/ScriptingModule.cpp 2012-08-15 02:08:03 UTC (rev 371) +++ trunk/ktutorial/ktutorial-library/src/scripting/ScriptingModule.cpp 2012-08-20 10:59:41 UTC (rev 372) @@ -16,6 +16,8 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ +#include <QMetaMethod> + #include <KDebug> #include "ScriptingModule.h" Modified: trunk/ktutorial/ktutorial-library/src/tutorials/UsingKTutorial.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/tutorials/UsingKTutorial.cpp 2012-08-15 02:08:03 UTC (rev 371) +++ trunk/ktutorial/ktutorial-library/src/tutorials/UsingKTutorial.cpp 2012-08-20 10:59:41 UTC (rev 372) @@ -62,7 +62,8 @@ } virtual void setup() { - QTextEdit* textEdit = new QTextEdit(KTutorial::self()->parentWidget()); + QTextEdit* textEdit = new QTextEdit( + KTutorial::self()->mainApplicationWindow()); textEdit->setAttribute(Qt::WA_DeleteOnClose); textEdit->setWindowFlags(Qt::Window | Qt::WindowStaysOnTopHint); textEdit->setObjectName("usingKTutorialTextEdit"); Modified: trunk/ktutorial/ktutorial-library/tests/CMakeLists.txt =================================================================== --- trunk/ktutorial/ktutorial-library/tests/CMakeLists.txt 2012-08-15 02:08:03 UTC (rev 371) +++ trunk/ktutorial/ktutorial-library/tests/CMakeLists.txt 2012-08-20 10:59:41 UTC (rev 372) @@ -1,4 +1,5 @@ add_subdirectory(common) +add_subdirectory(customization) add_subdirectory(extendedinformation) add_subdirectory(scripting) add_subdirectory(view) Added: trunk/ktutorial/ktutorial-library/tests/customization/CMakeLists.txt =================================================================== --- trunk/ktutorial/ktutorial-library/tests/customization/CMakeLists.txt (rev 0) +++ trunk/ktutorial/ktutorial-library/tests/customization/CMakeLists.txt 2012-08-20 10:59:41 UTC (rev 372) @@ -0,0 +1,31 @@ +# Used by kde4_add_unit_test to set the full path to test executables +set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) + +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${ktutorial-library_SOURCE_DIR}/src/customization ${KDE4_INCLUDES}) + +# Since Qt 4.6.0, this definition is needed for GUI testing. +# It is backwards compatible with previous Qt versions, unlike the alternative +# which is to add #include <QTestGui> in the test files. +add_definitions(-DQT_GUI_LIB) + +MACRO(UNIT_TESTS) + FOREACH(_className ${ARGN}) + set(_testName ${_className}Test) + kde4_add_unit_test(${_testName} TESTNAME ktutorial-${_testName} ${_testName}.cpp) + target_link_libraries(${_testName} ktutorial ktutorial_customization ${QT_QTTEST_LIBRARY}) + ENDFOREACH(_className) +ENDMACRO(UNIT_TESTS) + +unit_tests( + DefaultKdeCustomization +) + +MACRO(MEM_TESTS) + FOREACH(_testname ${ARGN}) + add_test(ktutorial-mem-${_testname} ${CMAKE_CURRENT_SOURCE_DIR}/../runMemcheck.py ${CMAKE_CURRENT_BINARY_DIR}/${_testname}Test ${CMAKE_CURRENT_BINARY_DIR}) + ENDFOREACH(_testname) +ENDMACRO(MEM_TESTS) + +mem_tests( + DefaultKdeCustomization +) Property changes on: trunk/ktutorial/ktutorial-library/tests/customization/CMakeLists.txt ___________________________________________________________________ Added: svn:eol-style + native Added: trunk/ktutorial/ktutorial-library/tests/customization/DefaultKdeCustomizationTest.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/tests/customization/DefaultKdeCustomizationTest.cpp (rev 0) +++ trunk/ktutorial/ktutorial-library/tests/customization/DefaultKdeCustomizationTest.cpp 2012-08-20 10:59:41 UTC (rev 372) @@ -0,0 +1,154 @@ +/*************************************************************************** + * Copyright (C) 2012 by Daniel Calviño Sánchez * + * dan...@gm... * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; If not, see <http://www.gnu.org/licenses/>. * + ***************************************************************************/ + +#include <QtTest> + +#include <KAction> +#include <KActionCollection> + +#include "DefaultKdeCustomization.h" +#include "../Step.h" +#include "../Tutorial.h" +#include "../TutorialInformation.h" +#include "../TutorialManager.h" +#include "../view/StepTextWidget.h" +#include "../view/StepWidget.h" +#include "../view/TutorialManagerDialog.h" + +using ktutorial::Step; +using ktutorial::Tutorial; +using ktutorial::TutorialInformation; +using ktutorial::view::StepTextWidget; +using ktutorial::view::StepWidget; +using ktutorial::view::TutorialManagerDialog; + +namespace ktutorial { +namespace customization { + +class DefaultKdeCustomizationTest: public QObject { +Q_OBJECT +private slots: + + void initTestCase(); + + void testSetup(); + + void testMainApplicationWindow(); + + void testShowTutorialUI(); + + void testShowTutorialManagerUsingAction(); + +}; + +void DefaultKdeCustomizationTest::initTestCase() { + //Set the application name to prevent a QtDBus assert complaining that + //"Invalid object path given", as KXmlGuiWindow seems to register itself in + //DBus. + QApplication::setApplicationName("DefaultKdeCustomizationTest"); +} + +void DefaultKdeCustomizationTest::testSetup() { + KXmlGuiWindow window; + DefaultKdeCustomization customization(&window); + TutorialManager tutorialManager; + + QVERIFY(!window.actionCollection()->action("tutorials")); + QCOMPARE(tutorialManager.tutorialInformations().size(), 0); + + customization.setup(&tutorialManager); + + QAction* action = window.findChild<QAction*>("tutorials"); + QVERIFY(action); + QVERIFY(action->isEnabled()); + + QCOMPARE(tutorialManager.tutorialInformations().size(), 1); + QCOMPARE(tutorialManager.tutorialInformations()[0]->id(), + QString("usingKTutorial")); +} + +void DefaultKdeCustomizationTest::testMainApplicationWindow() { + KXmlGuiWindow window; + DefaultKdeCustomization customization(&window); + + QCOMPARE(customization.mainApplicationWindow(), &window); +} + +void DefaultKdeCustomizationTest::testShowTutorialUI() { + KXmlGuiWindow window; + DefaultKdeCustomization customization(&window); + + Tutorial tutorial(new TutorialInformation("test")); + + //Tutorial* must be registered in order to be used with QSignalSpy + qRegisterMetaType<Tutorial*>("Tutorial*"); + QSignalSpy finishedSpy(&tutorial, SIGNAL(finished(Tutorial*))); + + Step* startStep = new Step("start"); + startStep->setText("Start step"); + tutorial.addStep(startStep); + + Step* endStep = new Step("end"); + endStep->setText("End step"); + tutorial.addStep(endStep); + + customization.showTutorialUI(&tutorial); + tutorial.start(); + + StepWidget* stepWidget = window.findChild<StepWidget*>(); + QVERIFY(stepWidget); + + StepTextWidget* stepTextWidget = stepWidget->findChild<StepTextWidget*>(); + QVERIFY(stepTextWidget); + QCOMPARE(stepTextWidget->toPlainText(), QString("Start step")); + + tutorial.nextStep("end"); + + QCOMPARE(stepTextWidget->toPlainText(), QString("End step")); + + QCOMPARE(finishedSpy.count(), 0); + + stepWidget->close(); + + QCOMPARE(finishedSpy.count(), 1); +} + +void DefaultKdeCustomizationTest::testShowTutorialManagerUsingAction() { + KXmlGuiWindow window; + DefaultKdeCustomization customization(&window); + TutorialManager tutorialManager; + customization.setup(&tutorialManager); + + QAction* action = window.findChild<QAction*>("tutorials"); + QVERIFY(action); + QVERIFY(action->isEnabled()); + + action->trigger(); + TutorialManagerDialog* dialog = window.findChild<TutorialManagerDialog*>(); + + QVERIFY(dialog); + QVERIFY(dialog->isModal()); + QVERIFY(dialog->testAttribute(Qt::WA_DeleteOnClose)); +} + +} +} + +QTEST_MAIN(ktutorial::customization::DefaultKdeCustomizationTest) + +#include "DefaultKdeCustomizationTest.moc" Property changes on: trunk/ktutorial/ktutorial-library/tests/customization/DefaultKdeCustomizationTest.cpp ___________________________________________________________________ Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-08-15 02:08:10
|
Revision: 371 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=371&view=rev Author: danxuliu Date: 2012-08-15 02:08:03 +0000 (Wed, 15 Aug 2012) Log Message: ----------- Change file missed in previous commit (#370). Modified Paths: -------------- trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt Modified: trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt =================================================================== --- trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt 2012-08-15 00:58:48 UTC (rev 370) +++ trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt 2012-08-15 02:08:03 UTC (rev 371) @@ -16,7 +16,12 @@ # of the library. if(ktutorial-library_BINARY_DIR) set(KTUTORIAL_FOUND TRUE) - include_directories(${ktutorial-library_BINARY_DIR}/includes) + # Include the headers from the build directory before the general includes + # to ensure that, even if the KTutorial headers were installed, the ones + # from the build directory (and, thus, the most updated ones) are used. + # Not really necessary here, as the editor uses KDE4Defaults, and they set + # CMAKE_INCLUDE_DIRECTORIES_BEFORE to ON, but just in case this changes. + include_directories(BEFORE ${ktutorial-library_BINARY_DIR}/includes) set(KTUTORIAL_LIBRARIES ktutorial) endif(ktutorial-library_BINARY_DIR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-08-15 00:58:55
|
Revision: 370 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=370&view=rev Author: danxuliu Date: 2012-08-15 00:58:48 +0000 (Wed, 15 Aug 2012) Log Message: ----------- Fix using KTutorial headers already installed instead of the ones from the build directory when building KTutorial test app along with the library. Modified Paths: -------------- trunk/ktutorial/ktutorial-test-app/CMakeLists.txt Modified: trunk/ktutorial/ktutorial-test-app/CMakeLists.txt =================================================================== --- trunk/ktutorial/ktutorial-test-app/CMakeLists.txt 2012-08-14 22:34:53 UTC (rev 369) +++ trunk/ktutorial/ktutorial-test-app/CMakeLists.txt 2012-08-15 00:58:48 UTC (rev 370) @@ -10,7 +10,10 @@ # of the library. if(ktutorial-library_BINARY_DIR) set(KTUTORIAL_FOUND TRUE) - include_directories(${ktutorial-library_BINARY_DIR}/includes) + # Include the headers from the build directory before the general includes + # to ensure that, even if the KTutorial headers were installed, the ones + # from the build directory (and, thus, the most updated ones) are used. + include_directories(BEFORE ${ktutorial-library_BINARY_DIR}/includes) set(KTUTORIAL_LIBRARIES ktutorial) endif(ktutorial-library_BINARY_DIR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-08-14 22:34:59
|
Revision: 369 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=369&view=rev Author: danxuliu Date: 2012-08-14 22:34:53 +0000 (Tue, 14 Aug 2012) Log Message: ----------- Add KTutorial version support for FindKTutorial.cmake. Modified Paths: -------------- trunk/ktutorial/ktutorial-library/CMakeLists.txt trunk/ktutorial/ktutorial-library/cmake/modules/FindKTutorial.cmake trunk/ktutorial/ktutorial-library/src/CMakeLists.txt Added Paths: ----------- trunk/ktutorial/ktutorial-library/src/version.h.cmake Modified: trunk/ktutorial/ktutorial-library/CMakeLists.txt =================================================================== --- trunk/ktutorial/ktutorial-library/CMakeLists.txt 2012-08-11 01:33:20 UTC (rev 368) +++ trunk/ktutorial/ktutorial-library/CMakeLists.txt 2012-08-14 22:34:53 UTC (rev 369) @@ -3,6 +3,12 @@ set(QT_MIN_VERSION "4.6") find_package(KDE4 REQUIRED) +####### KTutorial version ####### +set(CMAKE_KTUTORIAL_VERSION_MAJOR 0) +set(CMAKE_KTUTORIAL_VERSION_MINOR 4) +set(CMAKE_KTUTORIAL_VERSION_RELEASE 98) +set(CMAKE_KTUTORIAL_VERSION_STRING "${CMAKE_KTUTORIAL_VERSION_MAJOR}.${CMAKE_KTUTORIAL_VERSION_MINOR}.${CMAKE_KTUTORIAL_VERSION_RELEASE}") + enable_testing() add_subdirectory(cmake) Modified: trunk/ktutorial/ktutorial-library/cmake/modules/FindKTutorial.cmake =================================================================== --- trunk/ktutorial/ktutorial-library/cmake/modules/FindKTutorial.cmake 2012-08-11 01:33:20 UTC (rev 368) +++ trunk/ktutorial/ktutorial-library/cmake/modules/FindKTutorial.cmake 2012-08-14 22:34:53 UTC (rev 369) @@ -4,11 +4,12 @@ # KTUTORIAL_FOUND - system has KTutorial # KTUTORIAL_INCLUDE_DIRS - the KTutorial include directories # KTUTORIAL_LIBRARIES - link these to use KTutorial +# KTUTORIAL_VERSION - the KTutorial version (string value) # # KTUTORIAL_INCLUDE_DIR - where to find ktutorial/KTutorial.h, etc # KTUTORIAL_LIBRARY - the KTutorial library # -# Copyright (c) 2010 Daniel Calviño Sánchez <dan...@gm...> +# Copyright (c) 2010-2012 Daniel Calviño Sánchez <dan...@gm...> # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -23,8 +24,18 @@ PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR} ) +if(KTUTORIAL_INCLUDE_DIR) + file(READ ${KTUTORIAL_INCLUDE_DIR}/ktutorial/version.h KTUTORIAL_VERSION_CONTENT) + string(REGEX MATCH "KTUTORIAL_VERSION_STRING \"(.*)\"\n" KTUTORIAL_VERSION_MATCH "${KTUTORIAL_VERSION_CONTENT}") + if(KTUTORIAL_VERSION_MATCH) + set(KTUTORIAL_VERSION "${CMAKE_MATCH_1}") + endif(KTUTORIAL_VERSION_MATCH) +endif(KTUTORIAL_INCLUDE_DIR) + include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(KTutorial DEFAULT_MSG KTUTORIAL_LIBRARY KTUTORIAL_INCLUDE_DIR) +find_package_handle_standard_args(KTutorial REQUIRED_VARS KTUTORIAL_LIBRARY KTUTORIAL_INCLUDE_DIR + VERSION_VAR KTUTORIAL_VERSION +) if(KTUTORIAL_FOUND) set(KTUTORIAL_INCLUDE_DIRS ${KTUTORIAL_INCLUDE_DIR}) Modified: trunk/ktutorial/ktutorial-library/src/CMakeLists.txt =================================================================== --- trunk/ktutorial/ktutorial-library/src/CMakeLists.txt 2012-08-11 01:33:20 UTC (rev 368) +++ trunk/ktutorial/ktutorial-library/src/CMakeLists.txt 2012-08-14 22:34:53 UTC (rev 369) @@ -13,6 +13,9 @@ add_subdirectory(editorsupport) endif (QT_QTDBUS_FOUND) +# version.h is used by FindKTutorial.cmake +configure_file(version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h) + include_directories(${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES}) set(ktutorial_LIB_SRCS @@ -66,12 +69,14 @@ WaitForSignal.h WaitForStepActivation.h WaitForWindow.h + ${CMAKE_CURRENT_BINARY_DIR}/version.h ) # Hack to make headers available to other ktutorial modules (like # ktutorial-test-app) when the library is built but not installed yet. foreach(header ${ktutorial_LIB_HEADERS}) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${header} ${ktutorial-library_BINARY_DIR}/includes/ktutorial/${header} COPYONLY) + get_filename_component(headerName ${header} NAME) + configure_file(${header} ${ktutorial-library_BINARY_DIR}/includes/ktutorial/${headerName} COPYONLY) endforeach(header) install(FILES ${ktutorial_LIB_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/ktutorial) Added: trunk/ktutorial/ktutorial-library/src/version.h.cmake =================================================================== --- trunk/ktutorial/ktutorial-library/src/version.h.cmake (rev 0) +++ trunk/ktutorial/ktutorial-library/src/version.h.cmake 2012-08-14 22:34:53 UTC (rev 369) @@ -0,0 +1,30 @@ +/*************************************************************************** + * Copyright (C) 2012 by Daniel Calviño Sánchez * + * dan...@gm... * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; If not, see <http://www.gnu.org/licenses/>. * + ***************************************************************************/ + +#ifndef KTUTORIAL_VERSION_H +#define KTUTORIAL_VERSION_H + +#define KTUTORIAL_VERSION_STRING "${CMAKE_KTUTORIAL_VERSION_STRING}" + +#define KTUTORIAL_VERSION_MAJOR ${CMAKE_KTUTORIAL_VERSION_MAJOR} + +#define KTUTORIAL_VERSION_MINOR ${CMAKE_KTUTORIAL_VERSION_MINOR} + +#define KTUTORIAL_VERSION_RELEASE ${CMAKE_KTUTORIAL_VERSION_RELEASE} + +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-08-11 01:33:32
|
Revision: 368 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=368&view=rev Author: danxuliu Date: 2012-08-11 01:33:20 +0000 (Sat, 11 Aug 2012) Log Message: ----------- Include all the library classes in "ktutorial" namespace. Modified Paths: -------------- trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp trunk/ktutorial/ktutorial-library/src/KTutorial.cpp trunk/ktutorial/ktutorial-library/src/KTutorial.h trunk/ktutorial/ktutorial-library/src/ObjectFinder.cpp trunk/ktutorial/ktutorial-library/src/ObjectFinder.h trunk/ktutorial/ktutorial-library/src/Option.h trunk/ktutorial/ktutorial-library/src/Step.cpp trunk/ktutorial/ktutorial-library/src/Step.h trunk/ktutorial/ktutorial-library/src/Tutorial.cpp trunk/ktutorial/ktutorial-library/src/Tutorial.h trunk/ktutorial/ktutorial-library/src/TutorialInformation.h trunk/ktutorial/ktutorial-library/src/TutorialManager.cpp trunk/ktutorial/ktutorial-library/src/TutorialManager.h trunk/ktutorial/ktutorial-library/src/WaitFor.h trunk/ktutorial/ktutorial-library/src/WaitForAnd.cpp trunk/ktutorial/ktutorial-library/src/WaitForAnd.h trunk/ktutorial/ktutorial-library/src/WaitForComposed.cpp trunk/ktutorial/ktutorial-library/src/WaitForComposed.h trunk/ktutorial/ktutorial-library/src/WaitForEvent.cpp trunk/ktutorial/ktutorial-library/src/WaitForEvent.h trunk/ktutorial/ktutorial-library/src/WaitForNot.cpp trunk/ktutorial/ktutorial-library/src/WaitForNot.h trunk/ktutorial/ktutorial-library/src/WaitForOr.cpp trunk/ktutorial/ktutorial-library/src/WaitForOr.h trunk/ktutorial/ktutorial-library/src/WaitForProperty.cpp trunk/ktutorial/ktutorial-library/src/WaitForProperty.h trunk/ktutorial/ktutorial-library/src/WaitForSignal.cpp trunk/ktutorial/ktutorial-library/src/WaitForSignal.h trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.cpp trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.h trunk/ktutorial/ktutorial-library/src/WaitForWindow.cpp trunk/ktutorial/ktutorial-library/src/WaitForWindow.h trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.cpp trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.h trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.h trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.h trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.h trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.h trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.h trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.h trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.cpp trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.h trunk/ktutorial/ktutorial-library/src/extendedinformation/WidgetHighlighter.cpp trunk/ktutorial/ktutorial-library/src/extendedinformation/WidgetHighlighter.h trunk/ktutorial/ktutorial-library/src/extendedinformation/WidgetHighlighterManager.cpp trunk/ktutorial/ktutorial-library/src/extendedinformation/WidgetHighlighterManager.h trunk/ktutorial/ktutorial-library/src/scripting/ScriptManager.cpp trunk/ktutorial/ktutorial-library/src/scripting/ScriptManager.h trunk/ktutorial/ktutorial-library/src/scripting/ScriptedStep.cpp trunk/ktutorial/ktutorial-library/src/scripting/ScriptedStep.h trunk/ktutorial/ktutorial-library/src/scripting/ScriptedTutorial.cpp trunk/ktutorial/ktutorial-library/src/scripting/ScriptedTutorial.h trunk/ktutorial/ktutorial-library/src/scripting/ScriptingModule.cpp trunk/ktutorial/ktutorial-library/src/scripting/ScriptingModule.h trunk/ktutorial/ktutorial-library/src/tutorials/UsingKTutorial.cpp trunk/ktutorial/ktutorial-library/src/tutorials/UsingKTutorial.h trunk/ktutorial/ktutorial-library/src/view/StepTextWidget.cpp trunk/ktutorial/ktutorial-library/src/view/StepTextWidget.h trunk/ktutorial/ktutorial-library/src/view/StepWidget.cpp trunk/ktutorial/ktutorial-library/src/view/StepWidget.h trunk/ktutorial/ktutorial-library/src/view/StepWidget.ui trunk/ktutorial/ktutorial-library/src/view/TutorialListModel.cpp trunk/ktutorial/ktutorial-library/src/view/TutorialListModel.h trunk/ktutorial/ktutorial-library/src/view/TutorialManagerDialog.cpp trunk/ktutorial/ktutorial-library/src/view/TutorialManagerDialog.h trunk/ktutorial/ktutorial-library/src/view/WindowOnTopEnforcer.cpp trunk/ktutorial/ktutorial-library/src/view/WindowOnTopEnforcer.h trunk/ktutorial/ktutorial-library/tests/ObjectFinderTest.cpp trunk/ktutorial/ktutorial-library/tests/OptionTest.cpp trunk/ktutorial/ktutorial-library/tests/StepTest.cpp trunk/ktutorial/ktutorial-library/tests/TutorialInformationTest.cpp trunk/ktutorial/ktutorial-library/tests/TutorialManagerTest.cpp trunk/ktutorial/ktutorial-library/tests/TutorialTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForAndTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForComposedTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForEventTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForNotTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForOrTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForPropertyTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForSignalTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForStepActivationTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForTest.cpp trunk/ktutorial/ktutorial-library/tests/WaitForWindowTest.cpp trunk/ktutorial/ktutorial-library/tests/common/WindowVisibilitySpyTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/ClassRegisterAdaptorTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/EditorSupportAdaptorTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/EditorSupportTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/EventSpyAdaptorTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/EventSpyTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/ObjectRegisterAdaptorTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/ObjectRegisterTest.cpp trunk/ktutorial/ktutorial-library/tests/extendedinformation/WidgetHighlighterManagerTest.cpp trunk/ktutorial/ktutorial-library/tests/extendedinformation/WidgetHighlighterTest.cpp trunk/ktutorial/ktutorial-library/tests/scripting/ScriptManagerTest.cpp trunk/ktutorial/ktutorial-library/tests/scripting/ScriptedStepTest.cpp trunk/ktutorial/ktutorial-library/tests/scripting/ScriptedTutorialTest.cpp trunk/ktutorial/ktutorial-library/tests/scripting/ScriptingModuleTest.cpp trunk/ktutorial/ktutorial-library/tests/scripting/ScriptingTest.cpp trunk/ktutorial/ktutorial-library/tests/view/StepTextWidgetTest.cpp trunk/ktutorial/ktutorial-library/tests/view/StepWidgetTest.cpp trunk/ktutorial/ktutorial-library/tests/view/TutorialListModelTest.cpp trunk/ktutorial/ktutorial-library/tests/view/TutorialManagerDialogTest.cpp trunk/ktutorial/ktutorial-library/tests/view/WindowOnTopEnforcerTest.cpp trunk/ktutorial/ktutorial-test-app/TestApp.cpp trunk/ktutorial/ktutorial-test-app/TutorialClearText.cpp trunk/ktutorial/ktutorial-test-app/TutorialClearText.h trunk/ktutorial/ktutorial-test-app/TutorialMoveText.cpp trunk/ktutorial/ktutorial-test-app/TutorialMoveText.h Modified: trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2011 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -68,7 +68,7 @@ mFileActions->newTutorial(); - KTutorial::self()->setup(this); + ktutorial::KTutorial::self()->setup(this); setupGUI(); } Modified: trunk/ktutorial/ktutorial-library/src/KTutorial.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/KTutorial.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/KTutorial.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -33,11 +33,13 @@ #include "editorsupport/EditorSupport.h" #endif -using scripting::ScriptingModule; -using scripting::ScriptManager; -using view::StepWidget; -using view::TutorialManagerDialog; +using ktutorial::scripting::ScriptingModule; +using ktutorial::scripting::ScriptManager; +using ktutorial::view::StepWidget; +using ktutorial::view::TutorialManagerDialog; +namespace ktutorial { + //public: //It inherits from QObject to be automatically destroyed when the parent @@ -133,5 +135,7 @@ mTutorialsAction->setEnabled(true); } +} + #include "moc_KTutorial.cpp" #include "KTutorial.moc" Modified: trunk/ktutorial/ktutorial-library/src/KTutorial.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/KTutorial.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/KTutorial.h 2012-08-11 01:33:20 UTC (rev 368) @@ -16,8 +16,8 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef KTUTORIAL_H -#define KTUTORIAL_H +#ifndef KTUTORIAL_KTUTORIAL_H +#define KTUTORIAL_KTUTORIAL_H #include <kxmlguiwindow.h> @@ -28,6 +28,8 @@ class KAction; +namespace ktutorial { + /** * Main class of KTutorial. * This class is used to setup KTutorial, register WaitFor classes to be created @@ -246,4 +248,6 @@ }; +} + #endif Modified: trunk/ktutorial/ktutorial-library/src/ObjectFinder.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/ObjectFinder.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/ObjectFinder.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -18,6 +18,8 @@ #include "ObjectFinder.h" +namespace ktutorial { + //private: QList<QObject*> ObjectFinder::getBestMatches(const QString& name, @@ -159,3 +161,5 @@ return filteredPaths; } + +} Modified: trunk/ktutorial/ktutorial-library/src/ObjectFinder.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/ObjectFinder.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/ObjectFinder.h 2012-08-11 01:33:20 UTC (rev 368) @@ -16,14 +16,16 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef OBJECTFINDER_H -#define OBJECTFINDER_H +#ifndef KTUTORIAL_OBJECTFINDER_H +#define KTUTORIAL_OBJECTFINDER_H #include <QObject> #include <QRegExp> #include "ktutorial_export.h" +namespace ktutorial { + /** * Helper class to find objects. * This class is not intended to be used directly. Instead, use @@ -239,4 +241,6 @@ }; +} + #endif Modified: trunk/ktutorial/ktutorial-library/src/Option.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/Option.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/Option.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Daniel Calviño Sánchez * + * Copyright (C) 2008-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,13 +16,15 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef OPTION_H -#define OPTION_H +#ifndef KTUTORIAL_OPTION_H +#define KTUTORIAL_OPTION_H #include <QObject> #include "ktutorial_export.h" +namespace ktutorial { + /** * An option shown to the user. * An option is something a user can choose to do in a Step. For example, in the @@ -86,4 +88,6 @@ }; +} + #endif Modified: trunk/ktutorial/ktutorial-library/src/Step.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/Step.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/Step.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2010 by Daniel Calviño Sánchez * + * Copyright (C) 2008-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -23,6 +23,8 @@ #include "WaitFor.h" #include "WaitForSignal.h" +namespace ktutorial { + //public: void Step::setActive(bool active) { @@ -220,4 +222,6 @@ emit nextStepRequested(mNextStepForWaitFor.value(waitFor)); } +} + #include "Step.moc" Modified: trunk/ktutorial/ktutorial-library/src/Step.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/Step.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/Step.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2011 by Daniel Calviño Sánchez * + * Copyright (C) 2008-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,8 +16,8 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef STEP_H -#define STEP_H +#ifndef KTUTORIAL_STEP_H +#define KTUTORIAL_STEP_H #include <QHash> #include <QList> @@ -26,9 +26,13 @@ #include "ktutorial_export.h" +namespace ktutorial { class Option; class WaitFor; +} +namespace ktutorial { + /** * A step in a Tutorial. * It is each of the tasks that must be accomplished when following a Tutorial. @@ -477,4 +481,6 @@ }; +} + #endif Modified: trunk/ktutorial/ktutorial-library/src/Tutorial.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/Tutorial.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/Tutorial.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2011 by Daniel Calviño Sánchez * + * Copyright (C) 2008-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -22,6 +22,8 @@ #include "Step.h" #include "TutorialInformation.h" +namespace ktutorial { + //public: Tutorial::~Tutorial() { @@ -116,3 +118,5 @@ emit stepActivated(step); } + +} Modified: trunk/ktutorial/ktutorial-library/src/Tutorial.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/Tutorial.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/Tutorial.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2011 by Daniel Calviño Sánchez * + * Copyright (C) 2008-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,17 +16,21 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef TUTORIAL_H -#define TUTORIAL_H +#ifndef KTUTORIAL_TUTORIAL_H +#define KTUTORIAL_TUTORIAL_H #include <QMap> #include <QObject> #include "ktutorial_export.h" +namespace ktutorial { class Step; class TutorialInformation; +} +namespace ktutorial { + /** * A tutorial. * A tutorial is composed by some information about it and several steps. The @@ -224,4 +228,6 @@ }; +} + #endif Modified: trunk/ktutorial/ktutorial-library/src/TutorialInformation.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/TutorialInformation.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/TutorialInformation.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Daniel Calviño Sánchez * + * Copyright (C) 2008-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,13 +16,15 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef TUTORIALINFORMATION_H -#define TUTORIALINFORMATION_H +#ifndef KTUTORIAL_TUTORIALINFORMATION_H +#define KTUTORIAL_TUTORIALINFORMATION_H #include <QObject> #include "ktutorial_export.h" +namespace ktutorial { + /** * Information about a Tutorial. * Contains the identifier, name and description of a Tutorial. @@ -112,4 +114,6 @@ }; +} + #endif Modified: trunk/ktutorial/ktutorial-library/src/TutorialManager.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/TutorialManager.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/TutorialManager.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2010 by Daniel Calviño Sánchez * + * Copyright (C) 2008-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -22,6 +22,8 @@ #include "Tutorial.h" #include "TutorialInformation.h" +namespace ktutorial { + //public: TutorialManager::~TutorialManager() { @@ -66,3 +68,5 @@ disconnect(this, SLOT(finish())); emit finished(); } + +} Modified: trunk/ktutorial/ktutorial-library/src/TutorialManager.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/TutorialManager.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/TutorialManager.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2010 by Daniel Calviño Sánchez * + * Copyright (C) 2008-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,8 +16,8 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef TUTORIALMANAGER_H -#define TUTORIALMANAGER_H +#ifndef KTUTORIAL_TUTORIALMANAGER_H +#define KTUTORIAL_TUTORIALMANAGER_H #include <QMap> #include <QObject> @@ -25,9 +25,13 @@ #include "ktutorial_export.h" +namespace ktutorial { class Tutorial; class TutorialInformation; +} +namespace ktutorial { + /** * Manager for tutorials. * A TutorialManager contains several tutorials and is responsible for start the @@ -120,4 +124,6 @@ }; +} + #endif Modified: trunk/ktutorial/ktutorial-library/src/WaitFor.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitFor.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitFor.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Daniel Calviño Sánchez * + * Copyright (C) 2008-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,13 +16,15 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef WAITFOR_H -#define WAITFOR_H +#ifndef KTUTORIAL_WAITFOR_H +#define KTUTORIAL_WAITFOR_H #include <QObject> #include "ktutorial_export.h" +namespace ktutorial { + /** * Abstract base class for conditions to be waited for. * Classes derived from this one model a condition to be waited for. WaitFor @@ -108,4 +110,6 @@ }; +} + #endif Modified: trunk/ktutorial/ktutorial-library/src/WaitForAnd.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForAnd.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitForAnd.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Daniel Calviño Sánchez * + * Copyright (C) 2008-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -18,6 +18,8 @@ #include "WaitForAnd.h" +namespace ktutorial { + //public: bool WaitForAnd::conditionMet() const { @@ -34,3 +36,5 @@ return true; } + +} Modified: trunk/ktutorial/ktutorial-library/src/WaitForAnd.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForAnd.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitForAnd.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Daniel Calviño Sánchez * + * Copyright (C) 2008-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,13 +16,15 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef WAITFORAND_H -#define WAITFORAND_H +#ifndef KTUTORIAL_WAITFORAND_H +#define KTUTORIAL_WAITFORAND_H #include "ktutorial_export.h" #include "WaitForComposed.h" +namespace ktutorial { + /** * Composed WaitFor that performs an AND between its children. */ @@ -46,4 +48,6 @@ }; +} + #endif Modified: trunk/ktutorial/ktutorial-library/src/WaitForComposed.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForComposed.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitForComposed.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2011 by Daniel Calviño Sánchez * + * Copyright (C) 2008-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -18,6 +18,8 @@ #include "WaitForComposed.h" +namespace ktutorial { + //public: void WaitForComposed::setActive(bool active) { @@ -56,3 +58,5 @@ emit waitEnded(this); } } + +} Modified: trunk/ktutorial/ktutorial-library/src/WaitForComposed.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForComposed.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitForComposed.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Daniel Calviño Sánchez * + * Copyright (C) 2008-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,13 +16,15 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef WAITFORCOMPOSED_H -#define WAITFORCOMPOSED_H +#ifndef KTUTORIAL_WAITFORCOMPOSED_H +#define KTUTORIAL_WAITFORCOMPOSED_H #include "ktutorial_export.h" #include "WaitFor.h" +namespace ktutorial { + /** * Abstract base class for composed conditions to wait for. * Classes derived from this one model a composed condition to be waited for. @@ -94,4 +96,6 @@ }; +} + #endif Modified: trunk/ktutorial/ktutorial-library/src/WaitForEvent.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForEvent.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitForEvent.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -22,6 +22,8 @@ #include <KDebug> +namespace ktutorial { + //public: WaitForEvent::WaitForEvent(): @@ -97,4 +99,6 @@ emit waitEnded(this); } +} + #include "WaitForEvent.moc" Modified: trunk/ktutorial/ktutorial-library/src/WaitForEvent.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForEvent.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitForEvent.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2011 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,8 +16,8 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef WAITFOREVENT_H -#define WAITFOREVENT_H +#ifndef KTUTORIAL_WAITFOREVENT_H +#define KTUTORIAL_WAITFOREVENT_H #include <QEvent> @@ -25,6 +25,8 @@ #include "WaitFor.h" +namespace ktutorial { + /** * Waits for an event of some specific type to be sent to an object. * When an event of the expected type is sent and the WaitForEvent is active, @@ -151,4 +153,6 @@ }; +} + #endif Modified: trunk/ktutorial/ktutorial-library/src/WaitForNot.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForNot.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitForNot.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Daniel Calviño Sánchez * + * Copyright (C) 2008-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -18,6 +18,8 @@ #include "WaitForNot.h" +namespace ktutorial { + //public: WaitForNot::WaitForNot(): WaitFor(), @@ -32,3 +34,5 @@ mWaitFor = waitFor; mWaitFor->setParent(this); } + +} Modified: trunk/ktutorial/ktutorial-library/src/WaitForNot.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForNot.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitForNot.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Daniel Calviño Sánchez * + * Copyright (C) 2008-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,13 +16,15 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef WAITFORNOT_H -#define WAITFORNOT_H +#ifndef KTUTORIAL_WAITFORNOT_H +#define KTUTORIAL_WAITFORNOT_H #include "ktutorial_export.h" #include "WaitFor.h" +namespace ktutorial { + /** * Special WaitFor class to negate other WaitFor objects. * This WaitFor is intended to be used only as a child of WaitForComposed @@ -118,4 +120,6 @@ }; +} + #endif Modified: trunk/ktutorial/ktutorial-library/src/WaitForOr.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForOr.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitForOr.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Daniel Calviño Sánchez * + * Copyright (C) 2008-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -18,6 +18,8 @@ #include "WaitForOr.h" +namespace ktutorial { + //public: bool WaitForOr::conditionMet() const { @@ -30,3 +32,5 @@ return false; } + +} Modified: trunk/ktutorial/ktutorial-library/src/WaitForOr.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForOr.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitForOr.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Daniel Calviño Sánchez * + * Copyright (C) 2008-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,13 +16,15 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef WAITFOROR_H -#define WAITFOROR_H +#ifndef KTUTORIAL_WAITFOROR_H +#define KTUTORIAL_WAITFOROR_H #include "ktutorial_export.h" #include "WaitForComposed.h" +namespace ktutorial { + /** * Composed WaitFor that performs an OR between its children. */ @@ -48,4 +50,6 @@ }; +} + #endif Modified: trunk/ktutorial/ktutorial-library/src/WaitForProperty.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForProperty.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitForProperty.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011 by Daniel Calviño Sánchez * + * Copyright (C) 2011-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -22,6 +22,8 @@ #include <KDebug> +namespace ktutorial { + //public: WaitForProperty::WaitForProperty(): WaitFor() { @@ -98,3 +100,5 @@ emit waitEnded(this); } } + +} Modified: trunk/ktutorial/ktutorial-library/src/WaitForProperty.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForProperty.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitForProperty.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011 by Daniel Calviño Sánchez * + * Copyright (C) 2011-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,8 +16,8 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef WAITFORPROPERTY_H -#define WAITFORPROPERTY_H +#ifndef KTUTORIAL_WAITFORPROPERTY_H +#define KTUTORIAL_WAITFORPROPERTY_H #include <QVariant> @@ -25,6 +25,8 @@ #include "WaitFor.h" +namespace ktutorial { + /** * Waits for a property to have a specific value. * When the property changes its value to the specified one and the @@ -160,4 +162,6 @@ }; +} + #endif Modified: trunk/ktutorial/ktutorial-library/src/WaitForSignal.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForSignal.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitForSignal.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -20,6 +20,8 @@ #include <KDebug> +namespace ktutorial { + //public: WaitForSignal::WaitForSignal(): WaitFor(), @@ -56,3 +58,5 @@ mConditionMet = true; emit waitEnded(this); } + +} Modified: trunk/ktutorial/ktutorial-library/src/WaitForSignal.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForSignal.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitForSignal.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Daniel Calviño Sánchez * + * Copyright (C) 2008-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,13 +16,15 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef WAITFORSIGNAL_H -#define WAITFORSIGNAL_H +#ifndef KTUTORIAL_WAITFORSIGNAL_H +#define KTUTORIAL_WAITFORSIGNAL_H #include "ktutorial_export.h" #include "WaitFor.h" +namespace ktutorial { + /** * Waits for a signal to be emitted. * When the signal is emitted and the WaitForSignal is active, the wait ends. @@ -113,4 +115,6 @@ }; +} + #endif Modified: trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011 by Daniel Calviño Sánchez * + * Copyright (C) 2011-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -24,6 +24,8 @@ #include "Tutorial.h" +namespace ktutorial { + //public: WaitForStepActivation::WaitForStepActivation(): WaitFor(), @@ -70,3 +72,5 @@ emit waitEnded(this); mDuringStepActivation = false; } + +} Modified: trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011 by Daniel Calviño Sánchez * + * Copyright (C) 2011-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,16 +16,20 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef WAITFORSTEPACTIVATION_H -#define WAITFORSTEPACTIVATION_H +#ifndef KTUTORIAL_WAITFORSTEPACTIVATION_H +#define KTUTORIAL_WAITFORSTEPACTIVATION_H #include "ktutorial_export.h" #include "WaitFor.h" +namespace ktutorial { class Step; class Tutorial; +} +namespace ktutorial { + /** * Waits for the activation of a step. * When the step is activated, the wait ends. @@ -116,4 +120,6 @@ }; +} + #endif Modified: trunk/ktutorial/ktutorial-library/src/WaitForWindow.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForWindow.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitForWindow.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -20,8 +20,10 @@ #include "KTutorial.h" #include "common/WindowVisibilitySpy.h" -using common::WindowVisibilitySpy; +using ktutorial::common::WindowVisibilitySpy; +namespace ktutorial { + //public: WaitForWindow::WaitForWindow(): WaitFor(), @@ -75,4 +77,6 @@ emit waitEnded(this); } +} + #include "WaitForWindow.moc" Modified: trunk/ktutorial/ktutorial-library/src/WaitForWindow.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/WaitForWindow.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/WaitForWindow.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,13 +16,15 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef WAITFORWINDOW_H -#define WAITFORWINDOW_H +#ifndef KTUTORIAL_WAITFORWINDOW_H +#define KTUTORIAL_WAITFORWINDOW_H #include "ktutorial_export.h" #include "WaitFor.h" +namespace ktutorial { + /** * Waits for a specific window to be shown. * When the window with the expected object name is shown and the WaitForEvent @@ -117,4 +119,6 @@ }; +} + #endif Modified: trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -21,6 +21,7 @@ #include "WindowVisibilitySpy.h" +namespace ktutorial { namespace common { //public: @@ -68,5 +69,6 @@ } } +} #include "WindowVisibilitySpy.moc" Modified: trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,11 +16,12 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef COMMON_WINDOWVISIBILITYSPY_H -#define COMMON_WINDOWVISIBILITYSPY_H +#ifndef KTUTORIAL_COMMON_WINDOWVISIBILITYSPY_H +#define KTUTORIAL_COMMON_WINDOWVISIBILITYSPY_H #include <QObject> +namespace ktutorial { namespace common { /** @@ -85,5 +86,6 @@ }; } +} #endif Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2011 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -21,6 +21,7 @@ #include "ClassRegisterAdaptor.h" #include "ObjectRegister.h" +namespace ktutorial { namespace editorsupport { //public: @@ -114,3 +115,4 @@ } } +} Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2011 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,16 +16,19 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef EDITORSUPPORT_CLASSREGISTERADAPTOR_H -#define EDITORSUPPORT_CLASSREGISTERADAPTOR_H +#ifndef KTUTORIAL_EDITORSUPPORT_CLASSREGISTERADAPTOR_H +#define KTUTORIAL_EDITORSUPPORT_CLASSREGISTERADAPTOR_H #include <QDBusAbstractAdaptor> #include <QStringList> +namespace ktutorial { namespace editorsupport { class ObjectRegister; } +} +namespace ktutorial { namespace editorsupport { /** @@ -120,5 +123,6 @@ }; } +} #endif Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -32,9 +32,10 @@ #include "../extendedinformation/WidgetHighlighterManager.h" #include "../scripting/ScriptedTutorial.h" -using extendedinformation::WidgetHighlighterManager; -using scripting::ScriptedTutorial; +using ktutorial::extendedinformation::WidgetHighlighterManager; +using ktutorial::scripting::ScriptedTutorial; +namespace ktutorial { namespace editorsupport { //public: @@ -147,3 +148,4 @@ } +} Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.h 2012-08-11 01:33:20 UTC (rev 368) @@ -16,20 +16,25 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef EDITORSUPPORT_EDITORSUPPORT_H -#define EDITORSUPPORT_EDITORSUPPORT_H +#ifndef KTUTORIAL_EDITORSUPPORT_EDITORSUPPORT_H +#define KTUTORIAL_EDITORSUPPORT_EDITORSUPPORT_H #include <QObject> +namespace ktutorial { class ObjectFinder; class Tutorial; +} +namespace ktutorial { namespace editorsupport { class EventSpy; class EventSupportAdaptor; class ObjectRegister; } +} +namespace ktutorial { namespace editorsupport { /** @@ -189,5 +194,6 @@ }; } +} #endif Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -22,6 +22,7 @@ #include "EditorSupport.h" #include "ObjectRegister.h" +namespace ktutorial { namespace editorsupport { //public: @@ -63,3 +64,4 @@ } } +} Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.h 2012-08-11 01:33:20 UTC (rev 368) @@ -16,16 +16,19 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef EDITORSUPPORT_EDITORSUPPORTADAPTOR_H -#define EDITORSUPPORT_EDITORSUPPORTADAPTOR_H +#ifndef KTUTORIAL_EDITORSUPPORT_EDITORSUPPORTADAPTOR_H +#define KTUTORIAL_EDITORSUPPORT_EDITORSUPPORTADAPTOR_H #include <QDBusAbstractAdaptor> +namespace ktutorial { namespace editorsupport { class EditorSupport; class ObjectRegister; } +} +namespace ktutorial { namespace editorsupport { /** @@ -110,5 +113,6 @@ }; } +} #endif Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -20,6 +20,7 @@ #include "EventSpy.h" +namespace ktutorial { namespace editorsupport { //public: @@ -48,3 +49,4 @@ } } +} Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,11 +16,12 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef EDITORSUPPORT_EVENTSPY_H -#define EDITORSUPPORT_EVENTSPY_H +#ifndef KTUTORIAL_EDITORSUPPORT_EVENTSPY_H +#define KTUTORIAL_EDITORSUPPORT_EVENTSPY_H #include <QObject> +namespace ktutorial { namespace editorsupport { /** @@ -73,5 +74,6 @@ }; } +} #endif Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -23,6 +23,7 @@ #include "EventSpy.h" #include "ObjectRegister.h" +namespace ktutorial { namespace editorsupport { //public: @@ -48,3 +49,4 @@ } } +} Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,16 +16,19 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef EDITORSUPPORT_EVENTSPYADAPTOR_H -#define EDITORSUPPORT_EVENTSPYADAPTOR_H +#ifndef KTUTORIAL_EDITORSUPPORT_EVENTSPYADAPTOR_H +#define KTUTORIAL_EDITORSUPPORT_EVENTSPYADAPTOR_H #include <QDBusAbstractAdaptor> +namespace ktutorial { namespace editorsupport { class EventSpy; class ObjectRegister; } +} +namespace ktutorial { namespace editorsupport { /** @@ -79,5 +82,6 @@ }; } +} #endif Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -18,6 +18,7 @@ #include "ObjectRegister.h" +namespace ktutorial { namespace editorsupport { //public: @@ -83,3 +84,4 @@ } } +} Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.h 2012-08-11 01:33:20 UTC (rev 368) @@ -16,12 +16,13 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef EDITORSUPPORT_OBJECTREGISTER_H -#define EDITORSUPPORT_OBJECTREGISTER_H +#ifndef KTUTORIAL_EDITORSUPPORT_OBJECTREGISTER_H +#define KTUTORIAL_EDITORSUPPORT_OBJECTREGISTER_H #include <QHash> #include <QObject> +namespace ktutorial { namespace editorsupport { /** @@ -119,5 +120,6 @@ }; } +} #endif Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.cpp 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.cpp 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2011 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -19,6 +19,7 @@ #include "ObjectRegisterAdaptor.h" #include "ObjectRegister.h" +namespace ktutorial { namespace editorsupport { //public: @@ -77,3 +78,4 @@ } } +} Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.h =================================================================== --- trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.h 2012-08-10 18:15:15 UTC (rev 367) +++ trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.h 2012-08-11 01:33:20 UTC (rev 368) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -16,15 +16,18 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifnd... [truncated message content] |
From: <dan...@us...> - 2012-08-10 18:15:21
|
Revision: 367 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=367&view=rev Author: danxuliu Date: 2012-08-10 18:15:15 +0000 (Fri, 10 Aug 2012) Log Message: ----------- Update names in tutorials to take into account the new ambiguity solving rules. Modified Paths: -------------- trunk/ktutorial/ktutorial-editor/src/tutorials/BasicConcepts.js trunk/ktutorial/ktutorial-editor/src/tutorials/BasicConcepts.xml trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.js trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.xml Modified: trunk/ktutorial/ktutorial-editor/src/tutorials/BasicConcepts.js =================================================================== --- trunk/ktutorial/ktutorial-editor/src/tutorials/BasicConcepts.js 2012-08-10 18:14:12 UTC (rev 366) +++ trunk/ktutorial/ktutorial-editor/src/tutorials/BasicConcepts.js 2012-08-10 18:15:15 UTC (rev 367) @@ -106,9 +106,9 @@ newWaitForSignalForStartStepReactionStep.setText(t.i18nc("@info", "<para>In the dialog you can select the type of condition to wait for.</para>\n\n<para>There are simple and composed conditions. Simple conditions wait for something specific. Composed conditions wait for other conditions to be met.</para>\n\n<para>In this case, as it will be explained later, we want to wait for a signal, so select \"The specified signal is emitted\" in the <link url=\"widget:waitForTypeComboBox\">combobox</link> and accept the dialog.</para>")); function newWaitForSignalForStartStepReactionStepSetup(step) { - waitForClickedByOkButton = ktutorial.newWaitFor("WaitForSignal"); - waitForClickedByOkButton.setSignal(ktutorial.findObject("okButton"), "clicked()"); - step.addWaitFor(waitForClickedByOkButton, "editWaitForSignalInStartStepReaction"); + waitForClickedByAddWaitForDialogOkButton = ktutorial.newWaitFor("WaitForSignal"); + waitForClickedByAddWaitForDialogOkButton.setSignal(ktutorial.findObject("addWaitForDialog/okButton"), "clicked()"); + step.addWaitFor(waitForClickedByAddWaitForDialogOkButton, "editWaitForSignalInStartStepReaction"); } connect(newWaitForSignalForStartStepReactionStep, "setup(QObject*)", this, "newWaitForSignalForStartStepReactionStepSetup(QObject*)"); @@ -134,9 +134,9 @@ setWaitForSignalTextChangedDataStep.setText(t.i18nc("@info", "<para>The parameters that have to be set depend on the type of the condition. In this case, the name of the object that emits the signal and the name of the signal are needed.</para>\n\n<para><application>KTutorial editor</application> is able to <emphasis>talk</emphasis> to the application that the tutorial is being designed for and show you the name of the objects and the signals they emit. However, this will be seen in another tutorial. In this one you will be given all the values you need.</para>\n\n<para>Ok, back to the condition. We have asked the user to write <emphasis>Hello world!</emphasis> in the text area, so we want to react when the text in the text area changes.</para>\n\n<para>The text area is appropriately named <emphasis>textArea</emphasis>, and it emits the signal <emphasis>textChanged()</emphasis>. Set those values in the <link url=\"widget:objectNameLineEdit\"><interface>emitter name</interface> field</link> and in the <link url=\"widget:signalNameLineEdit\"><interface>signal name</interface> field</link>, respectively, and accept the dialog.</para>")); function setWaitForSignalTextChangedDataStepSetup(step) { - waitForClickedByOkButton = ktutorial.newWaitFor("WaitForSignal"); - waitForClickedByOkButton.setSignal(ktutorial.findObject("okButton"), "clicked()"); - step.addWaitFor(waitForClickedByOkButton, "setResponseInStartStepReaction"); + waitForClickedByEditWaitForSignalDialogOkButton = ktutorial.newWaitFor("WaitForSignal"); + waitForClickedByEditWaitForSignalDialogOkButton.setSignal(ktutorial.findObject("editWaitForSignalDialog/okButton"), "clicked()"); + step.addWaitFor(waitForClickedByEditWaitForSignalDialogOkButton, "setResponseInStartStepReaction"); } connect(setWaitForSignalTextChangedDataStep, "setup(QObject*)", this, "setWaitForSignalTextChangedDataStepSetup(QObject*)"); @@ -232,9 +232,9 @@ editWaitForSignalInClearTextStepStep.setText(t.i18nc("@info", "<para>Usually, buttons in tool bars and menu entries are graphical representations of the so called <emphasis>actions</emphasis>. Actions are commands given to the application, for example, <emphasis>add step</emphasis> or <emphasis>save file</emphasis>, and they behave the same no matter if they were triggered from a tool bar or from the menu.</para>\n\n<para>So, as a rule of thumb, when you expect the user to click on a menu item or in a tool bar button, wait for the <emphasis>triggered()</emphasis> signal of the action they represent, instead of the <emphasis>clicked()</emphasis> signal of the button.</para>\n\n<para>In this case, the object name of the action is just <emphasis>clear</emphasis>. Set it in the emitter name, set the signal name to <emphasis>triggered()</emphasis> and accept the dialog.</para>")); function editWaitForSignalInClearTextStepStepSetup(step) { - waitForClickedByOkButton = ktutorial.newWaitFor("WaitForSignal"); - waitForClickedByOkButton.setSignal(ktutorial.findObject("okButton"), "clicked()"); - step.addWaitFor(waitForClickedByOkButton, "setResponseInClearTextStepReaction"); + waitForClickedByEditWaitForSignalDialogOkButton = ktutorial.newWaitFor("WaitForSignal"); + waitForClickedByEditWaitForSignalDialogOkButton.setSignal(ktutorial.findObject("editWaitForSignalDialog/okButton"), "clicked()"); + step.addWaitFor(waitForClickedByEditWaitForSignalDialogOkButton, "setResponseInClearTextStepReaction"); } connect(editWaitForSignalInClearTextStepStep, "setup(QObject*)", this, "editWaitForSignalInClearTextStepStepSetup(QObject*)"); @@ -246,9 +246,9 @@ setResponseInClearTextStepReactionStep.setText(t.i18nc("@info", "<para>This time there is nothing else to be checked once the condition is met. When the clear action is triggered the text area is cleared, so the signal being emitted is enough to change to the next step in the tutorial.</para>\n\n<para>Just set the name of the step to change to, which we will call <emphasis>end</emphasis>, in the <link url=\"widget:responseStepLineEdit\"><interface>change to step</interface> field</link> and accept the dialog.</para>")); function setResponseInClearTextStepReactionStepSetup(step) { - waitForHideInReactionDialog = ktutorial.newWaitFor("WaitForEvent"); - waitForHideInReactionDialog.setEvent(ktutorial.findObject("ReactionDialog"), "Hide"); - step.addWaitFor(waitForHideInReactionDialog, "addEndStep"); + waitForClickedByOkButton = ktutorial.newWaitFor("WaitForSignal"); + waitForClickedByOkButton.setSignal(ktutorial.findObject("okButton"), "clicked()"); + step.addWaitFor(waitForClickedByOkButton, "addEndStep"); } connect(setResponseInClearTextStepReactionStep, "setup(QObject*)", this, "setResponseInClearTextStepReactionStepSetup(QObject*)"); Modified: trunk/ktutorial/ktutorial-editor/src/tutorials/BasicConcepts.xml =================================================================== --- trunk/ktutorial/ktutorial-editor/src/tutorials/BasicConcepts.xml 2012-08-10 18:14:12 UTC (rev 366) +++ trunk/ktutorial/ktutorial-editor/src/tutorials/BasicConcepts.xml 2012-08-10 18:15:15 UTC (rev 367) @@ -73,7 +73,7 @@ <para>In this case, as it will be explained later, we want to wait for a signal, so select "The specified signal is emitted" in the <link url="widget:waitForTypeComboBox">combobox</link> and accept the dialog.</para></text> <reaction triggerType="ConditionMet" responseType="NextStep"> - <waitForSignal emitterName="okButton" signalName="clicked()"/> + <waitForSignal emitterName="addWaitForDialog/okButton" signalName="clicked()"/> <nextStep id="editWaitForSignalInStartStepReaction"/> </reaction> </step> @@ -97,7 +97,7 @@ <para>The text area is appropriately named <emphasis>textArea</emphasis>, and it emits the signal <emphasis>textChanged()</emphasis>. Set those values in the <link url="widget:objectNameLineEdit"><interface>emitter name</interface> field</link> and in the <link url="widget:signalNameLineEdit"><interface>signal name</interface> field</link>, respectively, and accept the dialog.</para></text> <reaction triggerType="ConditionMet" responseType="NextStep"> - <waitForSignal emitterName="okButton" signalName="clicked()"/> + <waitForSignal emitterName="editWaitForSignalDialog/okButton" signalName="clicked()"/> <nextStep id="setResponseInStartStepReaction"/> </reaction> </step> @@ -169,7 +169,7 @@ <para>In this case, the object name of the action is just <emphasis>clear</emphasis>. Set it in the emitter name, set the signal name to <emphasis>triggered()</emphasis> and accept the dialog.</para></text> <reaction triggerType="ConditionMet" responseType="NextStep"> - <waitForSignal emitterName="okButton" signalName="clicked()"/> + <waitForSignal emitterName="editWaitForSignalDialog/okButton" signalName="clicked()"/> <nextStep id="setResponseInClearTextStepReaction"/> </reaction> </step> @@ -178,7 +178,7 @@ <para>Just set the name of the step to change to, which we will call <emphasis>end</emphasis>, in the <link url="widget:responseStepLineEdit"><interface>change to step</interface> field</link> and accept the dialog.</para></text> <reaction triggerType="ConditionMet" responseType="NextStep"> - <waitForEvent receiverName="ReactionDialog" eventName="Hide"/> + <waitForSignal emitterName="okButton" signalName="clicked()"/> <nextStep id="addEndStep"/> </reaction> </step> Modified: trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.js =================================================================== --- trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.js 2012-08-10 18:14:12 UTC (rev 366) +++ trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.js 2012-08-10 18:15:15 UTC (rev 367) @@ -138,12 +138,12 @@ //Step acceptNewWaitForDialogForStartStepReaction acceptNewWaitForDialogForStartStepReactionStep = ktutorial.newStep("acceptNewWaitForDialogForStartStepReaction"); -acceptNewWaitForDialogForStartStepReactionStep.setText(t.i18nc("@info", "<para><link url=\"widget:okButton\">Accept the dialog</link> to add the condition to wait for.</para>")); +acceptNewWaitForDialogForStartStepReactionStep.setText(t.i18nc("@info", "<para><link url=\"widget:addWaitForDialog/okButton\">Accept the dialog</link> to add the condition to wait for.</para>")); function acceptNewWaitForDialogForStartStepReactionStepSetup(step) { - waitForClickedByOkButton = ktutorial.newWaitFor("WaitForSignal"); - waitForClickedByOkButton.setSignal(ktutorial.findObject("okButton"), "clicked()"); - step.addWaitFor(waitForClickedByOkButton, "editWaitForWindowInStartStepReaction"); + waitForClickedByAddWaitForDialogOkButton = ktutorial.newWaitFor("WaitForSignal"); + waitForClickedByAddWaitForDialogOkButton.setSignal(ktutorial.findObject("addWaitForDialog/okButton"), "clicked()"); + step.addWaitFor(waitForClickedByAddWaitForDialogOkButton, "editWaitForWindowInStartStepReaction"); } connect(acceptNewWaitForDialogForStartStepReactionStep, "setup(QObject*)", this, "acceptNewWaitForDialogForStartStepReactionStepSetup(QObject*)"); @@ -224,12 +224,12 @@ //Step selectStepDataDialogInRemoteObjectChooser selectStepDataDialogInRemoteObjectChooserStep = ktutorial.newStep("selectStepDataDialogInRemoteObjectChooser"); -selectStepDataDialogInRemoteObjectChooserStep.setText(t.i18nc("@info", "<para>You may have noticed that the list does not contain the object we are looking for, that is, the dialog that is shown to add a new step. The reason is that the list does not contain all the objects that may exist in the target application at any time. Instead, it is dynamic. When a new object is added or an existing one removed from the target application the list reflects that.</para>\n\n<para>So, in the target application, show the dialog to add a new step. Once you do this, a new object (and all its children) will be added to the end of the list. The object is called <emphasis>StepDataDialog</emphasis> and, yes, it is the dialog that has just been shown.</para>\n\n<para>Select the <emphasis>StepDataDialog</emphasis> element in the list and <link url=\"widget:okButton\">accept the dialog</link>.</para>")); +selectStepDataDialogInRemoteObjectChooserStep.setText(t.i18nc("@info", "<para>You may have noticed that the list does not contain the object we are looking for, that is, the dialog that is shown to add a new step. The reason is that the list does not contain all the objects that may exist in the target application at any time. Instead, it is dynamic. When a new object is added or an existing one removed from the target application the list reflects that.</para>\n\n<para>So, in the target application, show the dialog to add a new step. Once you do this, a new object (and all its children) will be added to the end of the list. The object is called <emphasis>StepDataDialog</emphasis> and, yes, it is the dialog that has just been shown.</para>\n\n<para>Select the <emphasis>StepDataDialog</emphasis> element in the list and <link url=\"widget:RemoteObjectChooser/okButton\">accept the dialog</link>.</para>")); function selectStepDataDialogInRemoteObjectChooserStepSetup(step) { - waitForClickedByOkButton = ktutorial.newWaitFor("WaitForSignal"); - waitForClickedByOkButton.setSignal(ktutorial.findObject("okButton"), "clicked()"); - step.addWaitFor(waitForClickedByOkButton, "acceptEditWaitForWindowDialogForStartStepReaction"); + waitForClickedByRemoteObjectChooserOkButton = ktutorial.newWaitFor("WaitForSignal"); + waitForClickedByRemoteObjectChooserOkButton.setSignal(ktutorial.findObject("RemoteObjectChooser/okButton"), "clicked()"); + step.addWaitFor(waitForClickedByRemoteObjectChooserOkButton, "acceptEditWaitForWindowDialogForStartStepReaction"); } connect(selectStepDataDialogInRemoteObjectChooserStep, "setup(QObject*)", this, "selectStepDataDialogInRemoteObjectChooserStepSetup(QObject*)"); @@ -238,12 +238,12 @@ //Step acceptEditWaitForWindowDialogForStartStepReaction acceptEditWaitForWindowDialogForStartStepReactionStep = ktutorial.newStep("acceptEditWaitForWindowDialogForStartStepReaction"); -acceptEditWaitForWindowDialogForStartStepReactionStep.setText(t.i18nc("@info", "<para>Now that the name of the window was set <link url=\"widget:okButton\">accept the dialog</link>.</para>")); +acceptEditWaitForWindowDialogForStartStepReactionStep.setText(t.i18nc("@info", "<para>Now that the name of the window was set <link url=\"widget:editWaitForWindowDialog/okButton\">accept the dialog</link>.</para>")); function acceptEditWaitForWindowDialogForStartStepReactionStepSetup(step) { - waitForHideInEditWaitForWindowDialog = ktutorial.newWaitFor("WaitForEvent"); - waitForHideInEditWaitForWindowDialog.setEvent(ktutorial.findObject("editWaitForWindowDialog"), "Hide"); - step.addWaitFor(waitForHideInEditWaitForWindowDialog, "setNextStepResponseInStartStepReaction"); + waitForClickedByEditWaitForWindowDialogOkButton = ktutorial.newWaitFor("WaitForSignal"); + waitForClickedByEditWaitForWindowDialogOkButton.setSignal(ktutorial.findObject("editWaitForWindowDialog/okButton"), "clicked()"); + step.addWaitFor(waitForClickedByEditWaitForWindowDialogOkButton, "setNextStepResponseInStartStepReaction"); } connect(acceptEditWaitForWindowDialogForStartStepReactionStep, "setup(QObject*)", this, "acceptEditWaitForWindowDialogForStartStepReactionStepSetup(QObject*)"); @@ -421,12 +421,12 @@ //Step acceptNewWaitForDialogForAcceptDialogStepReaction acceptNewWaitForDialogForAcceptDialogStepReactionStep = ktutorial.newStep("acceptNewWaitForDialogForAcceptDialogStepReaction"); -acceptNewWaitForDialogForAcceptDialogStepReactionStep.setText(t.i18nc("@info", "<para><link url=\"widget:okButton\">Accept the dialog</link> to add the condition to wait for.</para>")); +acceptNewWaitForDialogForAcceptDialogStepReactionStep.setText(t.i18nc("@info", "<para><link url=\"widget:addWaitForDialog/okButton\">Accept the dialog</link> to add the condition to wait for.</para>")); function acceptNewWaitForDialogForAcceptDialogStepReactionStepSetup(step) { - waitForClickedByOkButton = ktutorial.newWaitFor("WaitForSignal"); - waitForClickedByOkButton.setSignal(ktutorial.findObject("okButton"), "clicked()"); - step.addWaitFor(waitForClickedByOkButton, "editWaitForSignalInAcceptDialogStepReaction"); + waitForClickedByAddWaitForDialogOkButton = ktutorial.newWaitFor("WaitForSignal"); + waitForClickedByAddWaitForDialogOkButton.setSignal(ktutorial.findObject("addWaitForDialog/okButton"), "clicked()"); + step.addWaitFor(waitForClickedByAddWaitForDialogOkButton, "editWaitForSignalInAcceptDialogStepReaction"); } connect(acceptNewWaitForDialogForAcceptDialogStepReactionStep, "setup(QObject*)", this, "acceptNewWaitForDialogForAcceptDialogStepReactionStepSetup(QObject*)"); @@ -526,12 +526,12 @@ //Step acceptEditWaitForSignalDialogForAcceptDialogStepReaction acceptEditWaitForSignalDialogForAcceptDialogStepReactionStep = ktutorial.newStep("acceptEditWaitForSignalDialogForAcceptDialogStepReaction"); -acceptEditWaitForSignalDialogForAcceptDialogStepReactionStep.setText(t.i18nc("@info", "<para>Now that the emitter and signal names were set <link url=\"widget:okButton\">accept the dialog</link>.</para>")); +acceptEditWaitForSignalDialogForAcceptDialogStepReactionStep.setText(t.i18nc("@info", "<para>Now that the emitter and signal names were set <link url=\"widget:editWaitForSignalDialog/okButton\">accept the dialog</link>.</para>")); function acceptEditWaitForSignalDialogForAcceptDialogStepReactionStepSetup(step) { - waitForClickedByOkButton = ktutorial.newWaitFor("WaitForSignal"); - waitForClickedByOkButton.setSignal(ktutorial.findObject("okButton"), "clicked()"); - step.addWaitFor(waitForClickedByOkButton, "setNextStepResponseInAcceptDialogStepReaction"); + waitForClickedByEditWaitForSignalDialogOkButton = ktutorial.newWaitFor("WaitForSignal"); + waitForClickedByEditWaitForSignalDialogOkButton.setSignal(ktutorial.findObject("editWaitForSignalDialog/okButton"), "clicked()"); + step.addWaitFor(waitForClickedByEditWaitForSignalDialogOkButton, "setNextStepResponseInAcceptDialogStepReaction"); } connect(acceptEditWaitForSignalDialogForAcceptDialogStepReactionStep, "setup(QObject*)", this, "acceptEditWaitForSignalDialogForAcceptDialogStepReactionStepSetup(QObject*)"); Modified: trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.xml =================================================================== --- trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.xml 2012-08-10 18:14:12 UTC (rev 366) +++ trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.xml 2012-08-10 18:15:15 UTC (rev 367) @@ -75,9 +75,9 @@ </reaction> </step> <step id="acceptNewWaitForDialogForStartStepReaction"> - <text><para><link url="widget:okButton">Accept the dialog</link> to add the condition to wait for.</para></text> + <text><para><link url="widget:addWaitForDialog/okButton">Accept the dialog</link> to add the condition to wait for.</para></text> <reaction triggerType="ConditionMet" responseType="NextStep"> - <waitForSignal emitterName="okButton" signalName="clicked()"/> + <waitForSignal emitterName="addWaitForDialog/okButton" signalName="clicked()"/> <nextStep id="editWaitForWindowInStartStepReaction"/> </reaction> </step> @@ -147,16 +147,16 @@ <para>So, in the target application, show the dialog to add a new step. Once you do this, a new object (and all its children) will be added to the end of the list. The object is called <emphasis>StepDataDialog</emphasis> and, yes, it is the dialog that has just been shown.</para> -<para>Select the <emphasis>StepDataDialog</emphasis> element in the list and <link url="widget:okButton">accept the dialog</link>.</para></text> +<para>Select the <emphasis>StepDataDialog</emphasis> element in the list and <link url="widget:RemoteObjectChooser/okButton">accept the dialog</link>.</para></text> <reaction triggerType="ConditionMet" responseType="NextStep"> - <waitForSignal emitterName="okButton" signalName="clicked()"/> + <waitForSignal emitterName="RemoteObjectChooser/okButton" signalName="clicked()"/> <nextStep id="acceptEditWaitForWindowDialogForStartStepReaction"/> </reaction> </step> <step id="acceptEditWaitForWindowDialogForStartStepReaction"> - <text><para>Now that the name of the window was set <link url="widget:okButton">accept the dialog</link>.</para></text> + <text><para>Now that the name of the window was set <link url="widget:editWaitForWindowDialog/okButton">accept the dialog</link>.</para></text> <reaction triggerType="ConditionMet" responseType="NextStep"> - <waitForEvent receiverName="editWaitForWindowDialog" eventName="Hide"/> + <waitForSignal emitterName="editWaitForWindowDialog/okButton" signalName="clicked()"/> <nextStep id="setNextStepResponseInStartStepReaction"/> </reaction> </step> @@ -254,9 +254,9 @@ </reaction> </step> <step id="acceptNewWaitForDialogForAcceptDialogStepReaction"> - <text><para><link url="widget:okButton">Accept the dialog</link> to add the condition to wait for.</para></text> + <text><para><link url="widget:addWaitForDialog/okButton">Accept the dialog</link> to add the condition to wait for.</para></text> <reaction triggerType="ConditionMet" responseType="NextStep"> - <waitForSignal emitterName="okButton" signalName="clicked()"/> + <waitForSignal emitterName="addWaitForDialog/okButton" signalName="clicked()"/> <nextStep id="editWaitForSignalInAcceptDialogStepReaction"/> </reaction> </step> @@ -313,9 +313,9 @@ </reaction> </step> <step id="acceptEditWaitForSignalDialogForAcceptDialogStepReaction"> - <text><para>Now that the emitter and signal names were set <link url="widget:okButton">accept the dialog</link>.</para></text> + <text><para>Now that the emitter and signal names were set <link url="widget:editWaitForSignalDialog/okButton">accept the dialog</link>.</para></text> <reaction triggerType="ConditionMet" responseType="NextStep"> - <waitForSignal emitterName="okButton" signalName="clicked()"/> + <waitForSignal emitterName="editWaitForSignalDialog/okButton" signalName="clicked()"/> <nextStep id="setNextStepResponseInAcceptDialogStepReaction"/> </reaction> </step> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2012-08-10 18:14:19
|
Revision: 366 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=366&view=rev Author: danxuliu Date: 2012-08-10 18:14:12 +0000 (Fri, 10 Aug 2012) Log Message: ----------- Update exported tutorial for changes made on commit 325 ("Fix missed internationalization in options when exported to Javascript."). Modified Paths: -------------- trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.js Modified: trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.js =================================================================== --- trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.js 2012-08-10 18:05:55 UTC (rev 365) +++ trunk/ktutorial/ktutorial-editor/src/tutorials/InteractingWithTheTargetApplication.js 2012-08-10 18:14:12 UTC (rev 366) @@ -201,7 +201,8 @@ targetApplicationAlreadyRunningStep.setText(t.i18nc("@info", "<para><application>KTutorial editor</application> needs to know which application is the target application of the tutorial to \"talk\" with it.</para>\n\n<para>It seems that you already had selected the target application before starting this tutorial. Unfortunately, if the target application already selected is not <application>KTutorial editor</application>, you will have to close this tutorial and that target application, create a new tutorial (using <interface>File|New</interface>, or <interface>New</interface> in the tool bar) and start this tutorial again.</para>\n\n<para>Yes, I guess I should have warned you about this when you started this tutorial :P</para>")); function targetApplicationAlreadyRunningStepSetup(step) { - step.addOption(ktutorial.newOption("Continue"), "highlightWidgetInRemoteObjectChooser"); + continueOption = ktutorial.newOption(t.i18nc("@action Tutorial option", "Continue")); + step.addOption(continueOption, "highlightWidgetInRemoteObjectChooser"); } connect(targetApplicationAlreadyRunningStep, "setup(QObject*)", this, "targetApplicationAlreadyRunningStepSetup(QObject*)"); @@ -213,7 +214,8 @@ highlightWidgetInRemoteObjectChooserStep.setText(t.i18nc("@info", "<para>Now you have the list with the objects that KTutorial can access in the target application.</para>\n\n<para>Note that when you select a widget in the list the widget is highlighted in the target application. For example, select the object named <emphasis>centralTreeView</emphasis>. You will see that, in the target application, the tree view that shows the tutorial being designed is highlighted.</para>\n\n<para>The list also shows the parent/child relationship between objects. For example, select <emphasis>editTutorialDock</emphasis>. The whole dock is highlighted.</para>\n\n<para>Now, select the unnamed object from the ActionListWidget class that appears in the list as a child element of the <emphasis>editTutorialDock</emphasis>. Now only the buttons in the dock are highlighted, as they are part of that widget.</para>\n\n<para>And finally, if you select the <emphasis>setTutorialInformationToolButton</emphasis> element, only the button to set the information of the tutorial will be highlighted.</para>")); function highlightWidgetInRemoteObjectChooserStepSetup(step) { - step.addOption(ktutorial.newOption("Continue"), "selectStepDataDialogInRemoteObjectChooser"); + continueOption = ktutorial.newOption(t.i18nc("@action Tutorial option", "Continue")); + step.addOption(continueOption, "selectStepDataDialogInRemoteObjectChooser"); } connect(highlightWidgetInRemoteObjectChooserStep, "setup(QObject*)", this, "highlightWidgetInRemoteObjectChooserStepSetup(QObject*)"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |