diff options
Diffstat (limited to 'keduca/keduca/keducaview.cpp')
| -rw-r--r-- | keduca/keduca/keducaview.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp index f7871e5c..a369c112 100644 --- a/keduca/keduca/keducaview.cpp +++ b/keduca/keduca/keducaview.cpp @@ -33,9 +33,9 @@ #include <kio/netaccess.h> #include <tqtimer.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> -#include <tqtextedit.h> +#include <textedit.h> KEducaView::KEducaView( TQWidget *parent, const char *name ) : TQWidgetStack( parent, name ), _keducaFile( 0 ), _timeoutTimer( 0 ) @@ -60,7 +60,7 @@ void KEducaView::init() // Intro Screen _introWidget = new TQLabel( this, "introScreen" ); _introWidget->setBackgroundColor( TQt::white ); - _introWidget->tqsetAlignment( AlignCenter ); + _introWidget->setAlignment( AlignCenter ); _introWidget->setPixmap( TQPixmap( locate("data","keduca/pics/keduca_init.png") ) ); addWidget( _introWidget, 0 ); @@ -121,7 +121,7 @@ void KEducaView::slotButtonNext() _questionText->countdown(0); } - if( ( visibleWidget() == _questionWidget ) && !_isInittqStatus ) + if( ( visibleWidget() == _questionWidget ) && !_isInitStatus ) setResults(); _buttonGroup->clearAnswers(); @@ -209,7 +209,7 @@ void KEducaView::showRecord() // SHOW QUESTION ******************************************************************* _questionText->setPixmap( _keducaFile->getPicturePixmap() ); questionTextTemp = "<table width=100%><tr><td><b>" - + i18n("Question %1").tqarg(_keducaFileIndex) + "</b>"; + + i18n("Question %1").arg(_keducaFileIndex) + "</b>"; if( _keducaFile->getTotalPoints() > 0 ) questionTextTemp += "</td><td align=center bgColor=#336699><font color=#ffffff><b>" @@ -266,7 +266,7 @@ void KEducaView::showRecord() KMessageBox::information( this, i18n( "You have %1 seconds to complete this question.\n\n" "Press OK when you are ready." ) - .tqarg( _keducaFile->getQuestion(FileRead::TQF_TIME) ) ); + .arg( _keducaFile->getQuestion(FileRead::TQF_TIME) ) ); } int timeout = _keducaFile->getQuestionInt(FileRead::TQF_TIME); @@ -404,7 +404,7 @@ bool KEducaView::openURL( const KURL &url) if ( !_keducaFile->openFile( url ) ) return false; - _isInittqStatus = true; + _isInitStatus = true; _results = "<HTML>"; _correctAnswer = 0; _correctPoints = 0; @@ -436,12 +436,12 @@ void KEducaView::configWrite() Settings::writeConfig(); } -/** current tqStatus Points */ +/** current Status Points */ TQString KEducaView::currentStatusPoints() { - TQString temptqStatus; + TQString tempStatus; - temptqStatus = insertTable() + tempStatus = insertTable() + insertRow( i18n("Statistics"), true, 4) + insertRow( i18n("Correct questions"), TQString().setNum( _correctAnswer ), @@ -449,20 +449,20 @@ TQString KEducaView::currentStatusPoints() TQString().setNum( _incorrectAnswer ), true); if( _keducaFile->getTotalPoints() > 0 ) - temptqStatus += insertRow( i18n("Total points"), true, 4 ) + tempStatus += insertRow( i18n("Total points"), true, 4 ) + insertRow( i18n("Correct points"), TQString().setNum( _correctPoints ), i18n("Incorrect points"), TQString().setNum( _incorrectPoints ), true ); if( _keducaFile->getTotalTime() > 0 ) - temptqStatus += insertRow( i18n("Time"), true, 4 ) + tempStatus += insertRow( i18n("Time"), true, 4 ) + insertRow( i18n("Total time"), TQString().setNum( _keducaFile->getTotalTime() ), i18n("Time in tests"), TQString().setNum( _currentTime ), true ); - temptqStatus += insertTableClose(); - return temptqStatus; + tempStatus += insertTableClose(); + return tempStatus; } /** Set HTML table view with correct and incorrect answers */ @@ -503,15 +503,15 @@ TQString KEducaView::getTableQuestion( bool isCorrect, const TQString &correct, /** Define the next questions (random, secuencial) */ bool KEducaView::questionNext() { - if( !Settings::randomQuestions() && !_isInittqStatus ) + if( !Settings::randomQuestions() && !_isInitStatus ) { _keducaFile->recordNext(); return _keducaFile->recordEOF() ? false : true; } - if( _isInittqStatus ) + if( _isInitStatus ) { - _isInittqStatus = false; + _isInitStatus = false; if( !Settings::randomQuestions() ) return true; } |