Hello community, here is the log from the commit of package ktouch for openSUSE:Factory checked in at 2014-01-27 11:15:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-19 13:16:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ktouch.new/ktouch.changes 2014-01-27 11:15:55.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Jan 11 15:40:10 UTC 2014 - [email protected] + +- Update to 4.12.1 + * KDE 4.12.1 release + * See http://www.kde.org/announcements/announce-4.12.1.php + +------------------------------------------------------------------- Old: ---- ktouch-4.12.0.tar.xz New: ---- ktouch-4.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktouch.spec ++++++ --- /var/tmp/diff_new_pack.JVVCse/_old 2014-01-27 11:15:56.000000000 +0100 +++ /var/tmp/diff_new_pack.JVVCse/_new 2014-01-27 11:15:56.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ktouch # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: ktouch -Version: 4.12.0 +Version: 4.12.1 Release: 0 Summary: Touch Typing Tutor License: GPL-2.0+ ++++++ ktouch-4.12.0.tar.xz -> ktouch-4.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktouch-4.12.0/data/courses/fi.xml new/ktouch-4.12.1/data/courses/fi.xml --- old/ktouch-4.12.0/data/courses/fi.xml 2013-12-09 10:09:43.000000000 +0100 +++ new/ktouch-4.12.1/data/courses/fi.xml 2014-01-04 12:58:42.000000000 +0100 @@ -80,40 +80,40 @@ dfj djd fkkk fk dff d dkkf fd fk fdfj fk k dkkf djd dff dkd dff dkd kdk k dkkf k jk fkkk jd k jfkd fk fk jd k d dkd jd k dd -rd dffd -d fk k k dff dff dd fk fk fd jd dd jjd rd dkd dkf kdk fdfj +d dffd +d fk k k dff dff dd fk fk fd jd dd jjd d dkd dkf kdk fdfj d kdk -djd k fk rd dd fk dff dff kdk dkd dkf d k jk jfkd jd jfkd d +djd k fk d dd fk dff dff kdk dkd dkf d k jk jfkd jd jfkd d kdk dkd kdk djd jd dkf dkkf fkkk dd djd fd dkf fk dff dkkf fk fk fdfj -fk fk rd jjd k k dkkf d rd dkd dd rd jjd fk fd fk k jk rd +fk fk d jjd k k dkkf d d dkd dd d jjd fk fd fk k jk d fd fd djd k jjd djd fk k fjk k dd dfj kdk jd djd fk dfj fd k dffd jd djd -kdk dkd dd k fd fk jjd fjk fd rd fjk fk k dfj fd dd dkd d k +kdk dkd dd k fd fk jjd fjk fd d fjk fk k dfj fd dd dkd d k dd kdk -fjk fk dkkf dd dkkf dd rd fd jd k jjd k dkf djd dkf k dkd d +fjk fk dkkf dd dkkf dd d fd jd k jjd k dkf djd dkf k dkd d jd d fjk dkkf dffd k d fdfj djd kdk fkkk d dfj jk fk jd jfkd jd kdk dffd dd dkf dffd jk jk jd fd dkf k jd jfkd fdfj fkkk k dkf fdfj dfj -fd jd jd dd dd jd dd rd dkd dffd fd fkkk dffd dd fk jjd fk +fd jd jd dd dd jd dd d dkd dffd fd fkkk dffd dd fk jjd fk k k d dfj fdfj k fk fk dkd dkkf dffd dffd k fkkk dkf jk dkd fdfj jfkd jd dd jk fd dkf dkd dd k d k fdfj fdfj dd dffd djd dffd kdk dffd -fd jk dffd fk fd rd fdfj d fk d dff fkkk fk fk jd fkkk djd +fd jk dffd fk fd d fdfj d fk d dff fkkk fk fk jd fkkk djd fk fdfj jd jfkd dkkf fkkk dkkf kdk dd dfj k fk dfj fk jk fd jd k k kdk -k dfj dd k jfkd d fk jk rd fk k dffd fk djd jjd fk dkd dd +k dfj dd k jfkd d fk jk d fk k dffd fk djd jjd fk dkd dd dffd fk fk kdk fdfj dfj fd fk dd dffd dd dkd fkkk k dkf dkkf k jfkd -d dfj k fk fdfj dff fk djd dd d dff k fd rd fdfj fk fd dkd +d dfj k fk fdfj dff fk djd dd d dff k fd d fdfj fk fd dkd djd kdk fk fk dfj fk fdfj k dkf dkkf dffd k fk fk jfkd jk dffd fd dff @@ -121,19 +121,19 @@ dffd fdfj dkkf fd jd jfkd dffd d djd dkd fdfj fk dff fk fdfj jk fk dfj d dkf -rd rd jd rd jfkd dd jd k dffd fd dkd fk fk k dkd djd fk jjd +d d jd d jfkd dd jd k dffd fd dkd fk fk k dkd djd fk jjd jjd k dd dd jd fk fk fk jfkd fd d fk fk d fkkk dkkf jjd dkf fdfj fkkk -djd k fk k jd dd dkd djd k kdk rd djd k jjd k jd dfj dfj +djd k fk k jd dd dkd djd k kdk d djd k jjd k jd dfj dfj dkf jjd -fk fd rd jd fdfj jk fk fjk rd k jd dkf rd dkd fkkk jfkd jjd +fk fd d jd fdfj jk fk fjk d k jd dkf d dkd fkkk jfkd jjd jjd -fk jd fk jk dfj d fkkk k jjd jk fjk dd rd jd fdfj jd dfj jk +fk jd fk jk dfj d fkkk k jjd jk fjk dd d jd fdfj jd dfj jk dkkf fkkk fk fk dffd fk dfj jd dd jk dfj fjk fd jfkd fk fd jd fd jd k -dffd rd dkd dd fk fk jk dffd fk dkd fjk jk k jk djd fdfj fk +dffd d dkd dd fk fk jk dffd fk dkd fjk jk k jk djd fdfj fk dd jd</text> </lesson> <lesson> @@ -142,27 +142,27 @@ <newCharacters>ls</newCharacters> <text>fl s l ldk l s slj s dks sf kl ll ls l ls dss lkj slk ks jl jjss -l slj jl lkj l ldf s ld ll l ll ldk jjdl dlkk fl rs dss fld +l slj jl lkj l ldf s ld ll l ll ldk jjdl dlkk fl s dss fld fl kl fl fl lkj fld ld fld js l dss kl jl jl ldk fld s ls s js kl -ll ld dss fld l rs sf dss ll jl kl ls slj kl ldf kl dss rs +ll ld dss fld l s sf dss ll jl kl ls slj kl ldf kl dss s ls js -s dlkk js kl js ls fld jl jjdl ll jjdl ll rs ldf rs ld ldk +s dlkk js kl js ls fld jl jjdl ll jjdl ll s ldf s ld ldk slj -slj fl fld lkj rs ldf dlkk dss rs fl ld ldk kl dks fl sf +slj fl fld lkj s ldf dlkk dss s fl ld ldk kl dks fl sf dks ldk slj kl sf dlkk fl s kl l ll fl slj ll s s s dds s sf fld ks ks s -ll dss s sf dks fl ldf dks rs ld s jjss ll l slk kl dks sf +ll dss s sf dks fl ldf dks s ld s jjss ll l slk kl dks sf ll ldf -s ll dlkk rs jl l ll ls l ldk ldk js dss rs s slj l dks fld +s ll dlkk s jl l ll ls l ldk ldk js dss s s slj l dks fld jl ks dss dlkk ls kl ks kl js kl ldk kl ls l slk dlkk lkj slj dks -ld dks rs ldf dlkk ls s rs jjdl slk ldk slk dds lkj lkj s +ld dks s ldf dlkk ls s s jjdl slk ldk slk dds lkj lkj s jjdl -fl l s kl slk jjss ls ll dss sf slj dlkk jl fl kl fl jl rs +fl l s kl slk jjss ls ll dss sf slj dlkk jl fl kl fl jl s ls ll lkj lkj ls lkj kl fl fl ll fl dks l dlkk kl s ldk fl fl ks l kl @@ -172,25 +172,25 @@ dlkk fld ld s ls dlkk ld kl jl kl fl ls kl ls kl l sf l ls ldf dlkk kl -sf fl ks lkj fl jjdl ldk ls jjdl dlkk dlkk ldk rs sf slj ld +sf fl ks lkj fl jjdl ldk ls jjdl dlkk dlkk ldk s sf slj ld s l js ldf fld ldf dks ks ll jjdl slj fld dlkk s js l jjdl s s ks ld -ll lkj dds ldk ls fl ldk dss jl sf fld kl rs rs ll ldf s +ll lkj dds ldk ls fl ldk dss jl sf fld kl s s ll ldf s dks ls -ls dds slj dlkk jl l slk sf dks dks rs ldk jl dks l dlkk l -ks rs +ls dds slj dlkk jl l slk sf dks dks s ldk jl dks l dlkk l +ks s ks dks ks fld dds dss ldk kl s ks dks slk fl slj dds fl s js jjss -kl dks s fl rs s rs ldf ls sf ls ll rs sf dds dss jjdl l +kl dks s fl s s ldf ls sf ls ll s sf dds dss jjdl l slk ldk -rs kl ld ll kl ll fl jjss ls ldf ll jjss kl ll jjdl jjss sf +s kl ld ll kl ll fl jjss ls ldf ll jjss kl ll jjdl jjss sf ld -jjdl ks ld js l slj jjdl fl sf lkj kl rs jjdl ks s dds dss +jjdl ks ld js l slj jjdl fl sf lkj kl s jjdl ks s dds dss fl slk ll l l slj fl dss js lkj fld ks lkj ks ldk jjss ll ld l kl js fl -rs ls s s sf dds jl fld l lkj ls jl dss fl slk ldf jjdl l +s ls s s sf dds jl fld l lkj ls jl dss fl slk ldf jjdl l ks fl fld lkj js s js ld slk dlkk jl ks l dds ld lkj ll jjss ld jjss s @@ -198,7 +198,7 @@ ls ls fl sf kl ll kl ld jjss dds kl fld jjdl fl js jl sf kl kl jl jl -ldf ll dds dds s ll slk dks slj lkj fld kl ks rs fl kl ldk +ldf ll dds dds s ll slk dks slj lkj fld kl ks s fl kl ldk ld l</text> </lesson> <lesson> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktouch-4.12.0/src/editor/resourceeditor.cpp new/ktouch-4.12.1/src/editor/resourceeditor.cpp --- old/ktouch-4.12.0/src/editor/resourceeditor.cpp 2013-12-09 10:09:43.000000000 +0100 +++ new/ktouch-4.12.1/src/editor/resourceeditor.cpp 2014-01-04 12:58:42.000000000 +0100 @@ -40,6 +40,7 @@ #include "core/dataaccess.h" #include "core/resource.h" #include "core/course.h" +#include "core/lesson.h" #include "core/keyboardlayout.h" #include "core/resourcedataaccess.h" #include "core/userdataaccess.h" @@ -520,6 +521,11 @@ { case KMessageBox::Yes: course.setId(QUuid::createUuid()); + for (int j = 0; j < course.lessonCount(); j++) + { + Lesson* const lesson = course.lesson(j); + lesson->setId(QUuid::createUuid()); + } break; default: return true; @@ -536,6 +542,11 @@ { case KMessageBox::Yes: course.setId(QUuid::createUuid()); + for (int j = 0; j < course.lessonCount(); j++) + { + Lesson* const lesson = course.lesson(j); + lesson->setId(QUuid::createUuid()); + } break; case KMessageBox::No: overwriteDataIndexCourse = testCourse; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
