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

List:       kde-commits
Subject:    KDE/kdeedu/parley/src/practice
From:       Frederik Gladhorn <frederik.gladhorn () gmx ! de>
Date:       2007-10-06 15:50:49
Message-ID: 1191685849.936308.27554.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 722082 by gladhorn:

Let the multiple choice practice show the solution after the right answer was chosen.

 M  +14 -11    MCQueryDlg.cpp  
 M  +1 -0      MCQueryDlg.h  
 M  +7 -7      MCQueryDlgForm.ui  


--- trunk/KDE/kdeedu/parley/src/practice/MCQueryDlg.cpp #722081:722082
@@ -101,11 +101,9 @@
     mw->orgField->setFont(Prefs::tableFont());
     mw->orgField->setText(entry->exp->translation(Prefs::fromIdentifier()).text());
     mw->show_all->setDefault(true);
-    mw->know_it->setVisible(true);
-    mw->dont_know->setVisible(true);
-    mw->show_all->setVisible(true);
-    mw->continueButton->setVisible(false);
 
+    showContinueButton(false);
+
     // Query cycle - how often did this show up (?)
     mw->progCount->setText(QString::number(entry->statisticCount()));
 
@@ -257,13 +255,8 @@
     button_ref[0].first->setChecked(true);
     verifyButton(button_ref[0].first, true, button_ref[0].second);
 
-    mw->know_it->setVisible(false);
-    mw->dont_know->setVisible(false);
-    mw->show_all->setVisible(false);
+    showContinueButton(true);
 
-    mw->continueButton->setVisible(true);
-    mw->continueButton->setDefault(true);
-
     setAnswerTainted();
 }
 
@@ -288,7 +281,7 @@
 
     if (known) {
         resultCorrect();
-        emit nextEntry();
+        showContinueButton(true);
         mw->status->setText(
                 getOKComment((int)(((double)mw->countbar->value())
                     /mw->countbar->maximum() * 100.0)));
@@ -308,6 +301,16 @@
     mw->countbar->setValue(current);
 }
 
+void MCQueryDlg::showContinueButton(bool show)
+{
+    mw->know_it->setVisible(!show);
+    mw->dont_know->setVisible(!show);
+    mw->show_all->setVisible(!show);
 
+    mw->continueButton->setVisible(show);
+    mw->continueButton->setDefault(show);
+}
+
+
 #include "MCQueryDlg.moc"
 
--- trunk/KDE/kdeedu/parley/src/practice/MCQueryDlg.h #722081:722082
@@ -46,6 +46,7 @@
     void verifyClicked();
 
 private:
+    void showContinueButton(bool show);
     void setStatusText(const QString &statusText) { mw->status->setText(statusText); }
     QProgressBar* timebar() { return mw->timebar; }
 
--- trunk/KDE/kdeedu/parley/src/practice/MCQueryDlgForm.ui #722081:722082
@@ -309,6 +309,13 @@
           </widget>
          </item>
          <item row="2" column="0" >
+          <widget class="QPushButton" name="continueButton" >
+           <property name="text" >
+            <string>&amp;Continue</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1" >
           <spacer>
            <property name="orientation" >
             <enum>Qt::Horizontal</enum>
@@ -321,13 +328,6 @@
            </property>
           </spacer>
          </item>
-         <item row="2" column="1" >
-          <widget class="QPushButton" name="continueButton" >
-           <property name="text" >
-            <string>&amp;Continue</string>
-           </property>
-          </widget>
-         </item>
         </layout>
        </item>
        <item rowspan="2" row="0" column="1" >
[prev in list] [next in list] [prev in thread] [next in thread]