[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [parley] src: Merge branch Applications/14.12 into master.
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2015-02-07 13:00:28
Message-ID: E1YK4zs-0004mv-Pm () scm ! kde ! org
[Download RAW message or body]

Git commit bb5ae8c54128018f7f8e45dcf5edf69c9a7578d5 by Inge Wallin.
Committed on 05/02/2015 at 02:51.
Pushed by ingwa into branch 'master'.

Merge branch Applications/14.12 into master.

M  +2    -9    src/collection/testentry.cpp
M  +10   -10   src/practice/configure/generalpracticeoptions.ui
M  +1    -4    src/practice/practicestatemachine.cpp
M  +0    -4    src/settings/parley.kcfg

http://commits.kde.org/parley/bb5ae8c54128018f7f8e45dcf5edf69c9a7578d5

diff --git a/src/collection/testentry.cpp b/src/collection/testentry.cpp
index 205715d..3e152f1 100644
--- a/src/collection/testentry.cpp
+++ b/src/collection/testentry.cpp
@@ -73,18 +73,11 @@ void TestEntry::updateStatisticsRightAnswer(grade_t \
currentPreGrade, grade_t cur  m_isUnseenQuestion = true;
     }
 
-    if ((!Prefs::altLearn()) || m_answeredCorrectInSequence == 3) {
-        m_shouldChangeGrades = true;
-    }
+    m_shouldChangeGrades = true;
 
     // Make changes in statistics if answered correctly and not answered wrong in \
                current test
-    if (!Prefs::altLearn() && m_statisticBadCount == 0) {
+    if (m_statisticBadCount == 0) {
         m_correctAtFirstAttempt = true;
-    } else {
-        // alt learn: 3 times right
-        if (answeredCorrectInSequence() == 3  && m_statisticBadCount == 0) {
-            m_correctAtFirstAttempt = true;
-        }
     }
 }
 
diff --git a/src/practice/configure/generalpracticeoptions.ui \
b/src/practice/configure/generalpracticeoptions.ui index 2eb1188..a40c739 100644
--- a/src/practice/configure/generalpracticeoptions.ui
+++ b/src/practice/configure/generalpracticeoptions.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>558</width>
-    <height>354</height>
+    <height>364</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -57,17 +57,17 @@
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="kcfg_AltLearn">
-        <property name="toolTip">
-         <string>Requires you to answer each question correctly 3 times in a row for \
                it to be counted as correct.</string>
-        </property>
-        <property name="whatsThis">
-         <string>Requires you to answer each question correctly 3 times in a row for \
it to be counted as correct.</string> +       <spacer name="verticalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
         </property>
-        <property name="text">
-         <string>Require 3 consecutive correct answers</string>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
         </property>
-       </widget>
+       </spacer>
       </item>
      </layout>
     </widget>
diff --git a/src/practice/practicestatemachine.cpp \
b/src/practice/practicestatemachine.cpp index e18ce37..8756592 100644
--- a/src/practice/practicestatemachine.cpp
+++ b/src/practice/practicestatemachine.cpp
@@ -215,10 +215,7 @@ void PracticeStateMachine::updateFrontend()
     grade_t grade = m_mode->currentGradeForEntry();
     grade_t goodGrade = qMax(grade, grade_t(KV_LEV1_GRADE)); // if the word hasn't \
been practiced yet, use grade 1 as a base  
-    // Normal mode: check if current word was not answered wrong -> if yes, mark \
                next grade as achievable
-    // Alternative mode (3 consecutive answers): check if word was not answered \
                wrong and two consecutive times correct -> if yes, mark next grade as \
                achievable
-    if ((!(Prefs::altLearn()) && m_current->statisticBadCount() == 0) ||
-        (m_current->statisticBadCount() == 0 && \
m_current->answeredCorrectInSequence() == 2 && Prefs::altLearn())) { +    if \
(m_current->statisticBadCount() == 0) {  goodGrade = qMax(KV_LEV2_GRADE, qMin(grade + \
1, KV_MAX_GRADE));  }
 
diff --git a/src/settings/parley.kcfg b/src/settings/parley.kcfg
index fab0e60..0037420 100644
--- a/src/settings/parley.kcfg
+++ b/src/settings/parley.kcfg
@@ -69,10 +69,6 @@
       <label>In Blocking Query Tab Dialog, if checked then the Query accepts an \
expiring time</label>  <default>true</default>
     </entry>
-    <entry name="AltLearn" type="Bool">
-      <label>Use the Leitner learning method</label>
-      <default>false</default>
-    </entry>
     <entry name="TestOrderLesson" type="Bool">
       <label>Append new vocabulary in a collection in order of their units. Note \
that this will not be a hard transition, but a slow mix from one unit to the \
next.</label>  <default>true</default>


[prev in list] [next in list] [prev in thread] [next in thread]