Hello community, here is the log from the commit of package ktouch for openSUSE:Factory checked in at 2013-12-11 14:34:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktouch (Old) and /work/SRC/openSUSE:Factory/.ktouch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktouch" Changes: -------- --- /work/SRC/openSUSE:Factory/ktouch/ktouch.changes 2013-12-02 12:32:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ktouch.new/ktouch.changes 2013-12-11 14:34:07.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Nov 29 07:10:34 UTC 2013 - [email protected] + +- Update to 4.11.97 + * KDE 4.12 RC 1 release + * See http://www.kde.org/announcements/announce-4.12-rc.php + +------------------------------------------------------------------- +Sat Nov 23 22:24:41 UTC 2013 - [email protected] + +- Update to 4.11.95 + * KDE 4.12 Beta 3 release + * See http://www.kde.org/announcements/announce-4.12-beta3.php + +------------------------------------------------------------------- Old: ---- ktouch-4.11.90.tar.xz New: ---- ktouch-4.11.97.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktouch.spec ++++++ --- /var/tmp/diff_new_pack.knOanf/_old 2013-12-11 14:34:08.000000000 +0100 +++ /var/tmp/diff_new_pack.knOanf/_new 2013-12-11 14:34:08.000000000 +0100 @@ -17,7 +17,7 @@ Name: ktouch -Version: 4.11.90 +Version: 4.11.97 Release: 0 Summary: Touch Typing Tutor License: GPL-2.0+ ++++++ ktouch-4.11.90.tar.xz -> ktouch-4.11.97.tar.xz ++++++ Files old/ktouch-4.11.90/doc/custom-lessons-edit.png and new/ktouch-4.11.97/doc/custom-lessons-edit.png differ Files old/ktouch-4.11.90/doc/custom-lessons.png and new/ktouch-4.11.97/doc/custom-lessons.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktouch-4.11.90/doc/index.docbook new/ktouch-4.11.97/doc/index.docbook --- old/ktouch-4.11.90/doc/index.docbook 2013-11-08 16:28:20.000000000 +0100 +++ new/ktouch-4.11.97/doc/index.docbook 2013-11-26 13:16:18.000000000 +0100 @@ -46,7 +46,7 @@ <holder>Håvard Frøiland, Andreas Nicolai</holder> </copyright> <copyright> -<year>2011-2012</year> +<year>2011-2013</year> <holder>Sebastian Gottfried</holder> </copyright> @@ -111,15 +111,15 @@ <sect2> <title>Features</title> -<para>In its current version, &i18n-ktouch; 2.0 has quite a number of +<para>In its current version, &i18n-ktouch; 2.2 has quite a number of features, such as:</para> <itemizedlist> <listitem><simpara>Ships with dozens different courses in many languages and a comfortable course editor</simpara></listitem> <listitem><simpara>Support for different keyboard layouts with the ability to use and edit user-defined layouts</simpara></listitem> -<listitem><simpara>During your training session comprehensive statistical -information is obtained to help you or your teacher analyze your +<listitem><simpara>During your training session &i18n-ktouch; collects comprehensive statistical +information to help you or your teacher analyze your progress</simpara></listitem> </itemizedlist> <para> @@ -215,6 +215,14 @@ layout. </para> +<para> +You can switch between courses or choose <link linkend="custom_lessons">custom lessons</link> using the <inlinemediaobject> +<imageobject> <imagedata fileref="Icon-arrow-right.png" format="PNG"/> +</imageobject> </inlinemediaobject> and <inlinemediaobject> +<imageobject> <imagedata fileref="Icon-arrow-left.png" format="PNG"/> +</imageobject> </inlinemediaobject> buttons in the top right part of the window. +</para> + <note> <para> On some platforms, especially on &Microsoft; &Windows;, automatic keyboard layout @@ -1075,17 +1083,17 @@ field. </para> <para> -Use <inlinemediaobject> +Use the <inlinemediaobject> <imageobject> <imagedata fileref="Icon-document-open.png" -format="PNG"/> </imageobject> </inlinemediaobject> button to open generic text file -that will be imported into the lesson text field. +format="PNG"/> </imageobject> </inlinemediaobject> button to open a generic text file +that will be loaded into the lesson text field. </para> <para> The <inlinemediaobject> <imageobject> <imagedata fileref="Icon-format-justify-fill.png" format="PNG"/> </imageobject> </inlinemediaobject> button can be used to wrap the lesson text. -&i18n-ktouch; editor wraps such that every line of the lesson does not exceed 60 -characters limit. +&i18n-ktouch; editor wraps text such that every line of the lesson does not +exceed the recommended 60 characters limit. </para> <para> Let's assume you want to add a new lesson. There are a few guidelines you @@ -1401,6 +1409,69 @@ </sect2> </sect1> +<sect1 id="custom_lessons"> +<title>Custom Lessons</title> +<para> +The custom lessons feature allows you to extend your training material in +an easy way by choosing some arbitrary text. +</para> +<para> +The custom lessons are gathered in a special course, the <guilabel>Custom +Lessons</guilabel> course, always available right next to <link +linkend="picking_a_lesson">the normal built-in courses</link>. +</para> +<screenshot> +<screeninfo>Custom lessons course</screeninfo> +<mediaobject> +<imageobject> +<imagedata fileref="custom-lessons.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>Custom lessons course</phrase> +</textobject> +</mediaobject> +</screenshot> +<para> +This special course mostly acts like any other, training and statistics +gathering works as usual. Clicking on <guibutton>Create New Custom +Lesson</guibutton> or the <guibutton>Edit</guibutton> button (for +existing lessons) brings up a stripped-down version of <link +linkend="adding_lessons">the normal lesson editor</link>. +</para> +<screenshot> +<screeninfo>Custom lesson editor</screeninfo> +<mediaobject> +<imageobject> +<imagedata fileref="custom-lessons-edit.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>Custom lesson editor</phrase> +</textobject> +</mediaobject> +</screenshot> +<para> +Use <inlinemediaobject> +<imageobject> <imagedata fileref="Icon-document-open.png" +format="PNG"/> </imageobject> </inlinemediaobject> button to open a generic text +file that will be loaded into the lesson text field. +</para> +<para> +The <inlinemediaobject> +<imageobject> <imagedata fileref="Icon-format-justify-fill.png" +format="PNG"/> </imageobject> </inlinemediaobject> button can be used to wrap +the lesson text. &i18n-ktouch; editor wraps text such that every line of the +lesson does not exceed the recommended 60 characters limit. +</para> +<para> +The editor will highlight problematic sections of your lesson texts. Characters which can't by typed on your keyboard layout will be shown on a dark red, lines which are considered to be too long use a gray font for the excess characters. +</para> +<tip> +<para> +All custom lessons are stored per profile and keyboard layout individually. Use this to manage different sets of lessons depending on the specific training situation. +</para> +</tip> +</sect1> + <sect1 id="sharing_your_results"> <title>Sharing your results</title> <para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktouch-4.11.90/src/core/dbaccess.cpp new/ktouch-4.11.97/src/core/dbaccess.cpp --- old/ktouch-4.11.90/src/core/dbaccess.cpp 2013-11-08 16:28:20.000000000 +0100 +++ new/ktouch-4.11.97/src/core/dbaccess.cpp 2013-11-26 13:16:18.000000000 +0100 @@ -377,7 +377,7 @@ updateIdQuery.prepare("UPDATE course_lessons SET id = ? WHERE id = ?"); - foreach (const QString id, ids) + foreach (const QString& id, ids) { updateIdQuery.bindValue(0, QUuid::createUuid().toString()); updateIdQuery.bindValue(1, id); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktouch-4.11.90/src/declarativeitems/lessonpainter.cpp new/ktouch-4.11.97/src/declarativeitems/lessonpainter.cpp --- old/ktouch-4.11.90/src/declarativeitems/lessonpainter.cpp 2013-11-08 16:28:20.000000000 +0100 +++ new/ktouch-4.11.97/src/declarativeitems/lessonpainter.cpp 2013-11-26 13:16:18.000000000 +0100 @@ -175,7 +175,7 @@ void LessonPainter::reset() { - m_lines = m_lesson? m_lesson->text().split("\n"): QStringList(); + m_lines = m_lesson? m_lesson->text().split('\n'): QStringList(); updateDoc(); resetTrainingStatus(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktouch-4.11.90/src/editor/lessontexteditor.cpp new/ktouch-4.11.97/src/editor/lessontexteditor.cpp --- old/ktouch-4.11.90/src/editor/lessontexteditor.cpp 2013-11-08 16:28:20.000000000 +0100 +++ new/ktouch-4.11.97/src/editor/lessontexteditor.cpp 2013-11-26 13:16:18.000000000 +0100 @@ -116,11 +116,11 @@ text = text.replace('\n', " "); text = text.replace(QString::fromUtf8("\u2029"), " "); - const QStringList tokens(text.split(" ")); + const QStringList tokens(text.split(' ')); QStringList lines; QString currentLine(""); - foreach(const QString token, tokens) + foreach(const QString& token, tokens) { if (token.isEmpty()) continue; @@ -132,7 +132,7 @@ } else { - currentLine += currentLine.isEmpty()? token: " " + token; + currentLine += currentLine.isEmpty()? token: ' ' + token; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktouch-4.11.90/src/ui/courseeditor.ui new/ktouch-4.11.97/src/ui/courseeditor.ui --- old/ktouch-4.11.90/src/ui/courseeditor.ui 2013-11-08 16:28:20.000000000 +0100 +++ new/ktouch-4.11.97/src/ui/courseeditor.ui 2013-11-26 13:16:18.000000000 +0100 @@ -94,6 +94,9 @@ <property name="tabChangesFocus"> <bool>true</bool> </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> </widget> </item> </layout> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktouch-4.11.90/src/ui/customlessoneditorwidget.ui new/ktouch-4.11.97/src/ui/customlessoneditorwidget.ui --- old/ktouch-4.11.90/src/ui/customlessoneditorwidget.ui 2013-11-08 16:28:20.000000000 +0100 +++ new/ktouch-4.11.97/src/ui/customlessoneditorwidget.ui 2013-11-26 13:16:18.000000000 +0100 @@ -27,7 +27,7 @@ </widget> </item> <item row="0" column="1"> - <widget class="QLineEdit" name="m_titleLineEdit"/> + <widget class="KLineEdit" name="m_titleLineEdit"/> </item> </layout> </item> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktouch-4.11.90/src/ui/lessontexteditor.ui new/ktouch-4.11.97/src/ui/lessontexteditor.ui --- old/ktouch-4.11.90/src/ui/lessontexteditor.ui 2013-11-08 16:28:20.000000000 +0100 +++ new/ktouch-4.11.97/src/ui/lessontexteditor.ui 2013-11-26 13:16:18.000000000 +0100 @@ -10,9 +10,6 @@ <height>423</height> </rect> </property> - <property name="windowTitle"> - <string>Form</string> - </property> <layout class="QVBoxLayout" name="verticalLayout"> <property name="spacing"> <number>0</number> @@ -93,6 +90,9 @@ <property name="lineWrapMode"> <enum>QTextEdit::NoWrap</enum> </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> </widget> </item> </layout> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktouch-4.11.90/src/ui/newcoursewidget.ui new/ktouch-4.11.97/src/ui/newcoursewidget.ui --- old/ktouch-4.11.90/src/ui/newcoursewidget.ui 2013-11-08 16:28:20.000000000 +0100 +++ new/ktouch-4.11.97/src/ui/newcoursewidget.ui 2013-11-26 13:16:18.000000000 +0100 @@ -67,6 +67,9 @@ <property name="tabChangesFocus"> <bool>true</bool> </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> </widget> </item> </layout> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
