[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeedu/kvoctrain/kvoctrain
From: Pino Toscano <toscano.pino () tiscali ! it>
Date: 2007-01-21 11:58:05
Message-ID: 1169380685.998868.9282.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 625843 by pino:
less qt3/kde3 support
M +11 -11 kva_header.cpp
M +6 -6 kvoctrain.cpp
M +3 -2 query-dialogs/AdjQueryDlg.cpp
M +3 -2 query-dialogs/ArtQueryDlg.cpp
M +3 -2 query-dialogs/MCQueryDlg.cpp
M +21 -15 query-dialogs/RandomQueryDlg.cpp
M +3 -2 query-dialogs/SimpleQueryDlg.cpp
M +5 -4 query-dialogs/VerbQueryDlg.cpp
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/kva_header.cpp #625842:625843
@@ -50,8 +50,8 @@
if (header == KV_COL_LESS) {
header_m = new QMenu();
- header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), (header << 16) \
| IDH_SORT_COL_ALPHA);
- header_m->insertItem(SmallIconSet("sort_num"), i18n(SORT_NUM), (header << 16) | \
IDH_SORT_COL_NUM); + header_m->insertItem(KIcon("sort_incr"), i18n(SORT_ALPHA), \
(header << 16) | IDH_SORT_COL_ALPHA); + header_m->insertItem(KIcon("sort_num"), \
i18n(SORT_NUM), (header << 16) | IDH_SORT_COL_NUM);
connect (header_m, SIGNAL(activated(int)), this, SLOT(slotHeaderCallBack(int)));
connect (header_m, SIGNAL(highlighted(int)), this, SLOT(slotHeaderStatus(int)));
@@ -95,8 +95,8 @@
header_m = new QMenu();
if (header != KV_COL_ORG - KV_EXTRA_COLS ) {
- header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), \
(header << 16) | IDH_START_QUERY);
- header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple Choice"), \
(header << 16) | IDH_START_MULTIPLE); + header_m->insertItem(KIcon("run_query"), \
i18n("Create Random &Query"), (header << 16) | IDH_START_QUERY); + \
header_m->insertItem(KIcon("run_multi"), i18n("Create &Multiple Choice"), (header << \
16) | IDH_START_MULTIPLE);
header_m->setItemEnabled((header << 16) | IDH_START_MULTIPLE, \
m_doc->numIdentifiers() > 1);
header_m->setItemEnabled((header << 16) | IDH_START_QUERY, \
m_doc->numIdentifiers() > 1); header_m->insertSeparator();
@@ -109,11 +109,11 @@
header_m->insertItem(i18n("E&xamples"), (header << 16) | IDH_START_EXAMPLE);
header_m->insertItem(i18n("&Paraphrase"), (header << 16) | \
IDH_START_PARAPHRASE); header_m->insertSeparator();
- header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), \
(header+KV_EXTRA_COLS << 16) | IDH_SORT_COL_ALPHA);
- header_m->insertItem(SmallIconSet("set_language"), i18n("Set &Language"), \
langs_m, (2 << 16) | IDH_NULL); + header_m->insertItem(KIcon("sort_incr"), \
i18n(SORT_ALPHA), (header+KV_EXTRA_COLS << 16) | IDH_SORT_COL_ALPHA); + \
header_m->insertItem(KIcon("set_language"), i18n("Set &Language"), langs_m, (2 << 16) \
| IDH_NULL); header_m->insertSeparator();
header_m->insertItem(i18n("Reset &Grades"), (header << 16) | IDH_RESET_GRADE);
- header_m->insertItem(SmallIconSet("delete_table_col"), i18n("&Remove Column"), \
(header << 16) | IDH_REMOVE ); + header_m->insertItem(KIcon("delete_table_col"), \
i18n("&Remove Column"), (header << 16) | IDH_REMOVE ); }
else {
QMenu *query_m = new QMenu();
@@ -141,7 +141,7 @@
query_m->insertItem(i18n("From %1", m_doc->identifier(i)), (i << (16+8)) | \
IDH_START_QUERY); }
}
- header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), \
query_m, (3 << 16) | IDH_NULL); + header_m->insertItem(KIcon("run_query"), \
i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL);
connect (query_m, SIGNAL(activated(int)), this, SLOT(slotHeaderCallBack(int)));
connect (query_m, SIGNAL(highlighted(int)), this, SLOT(slotHeaderStatus(int)));
for (int i = 1; i < (int) m_doc->numIdentifiers(); i++) {
@@ -157,7 +157,7 @@
multiple_m->insertItem(i18n("From %1", m_doc->identifier(i)), (i << (16+8)) \
| IDH_START_MULTIPLE); }
}
- header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple Choice"), \
multiple_m, (4 << 16) | IDH_NULL); + header_m->insertItem(KIcon("run_multi"), \
i18n("Create &Multiple Choice"), multiple_m, (4 << 16) | IDH_NULL); \
header_m->insertSeparator();
header_m->insertItem(i18n("Train &Verbs"), (header << 16) | IDH_START_VERB);
header_m->insertItem(i18n("&Article Training"), (header << 16) | \
IDH_START_ARTICLE); @@ -171,8 +171,8 @@
connect (multiple_m, SIGNAL(highlighted(int)), this, \
SLOT(slotHeaderStatus(int)));
header_m->insertSeparator();
- header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), \
(header+KV_EXTRA_COLS << 16) | IDH_SORT_COL_ALPHA);
- header_m->insertItem(SmallIconSet("set_language"), i18n("Set &Language"), \
langs_m, (2 << 16) | IDH_NULL); + header_m->insertItem(KIcon("sort_incr"), \
i18n(SORT_ALPHA), (header+KV_EXTRA_COLS << 16) | IDH_SORT_COL_ALPHA); + \
header_m->insertItem(KIcon("set_language"), i18n("Set &Language"), langs_m, (2 << 16) \
| IDH_NULL); }
connect (header_m, SIGNAL(activated(int)), this, SLOT(slotHeaderCallBack(int)));
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/kvoctrain.cpp #625842:625843
@@ -879,8 +879,8 @@
int j;
header_m = new QMenu();
if (header != 0 ) {
- header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), \
(header << 16) | IDH_START_QUERY);
- header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple \
Choice"), (header << 16) | IDH_START_MULTIPLE); + \
header_m->insertItem(KIcon("run_query"), i18n("Create Random &Query"), (header << 16) \
| IDH_START_QUERY); + header_m->insertItem(KIcon("run_multi"), i18n("Create \
&Multiple Choice"), (header << 16) | IDH_START_MULTIPLE);
header_m->setItemEnabled((header << 16) | IDH_START_MULTIPLE, \
m_doc->numIdentifiers() > 1);
header_m->setItemEnabled((header << 16) | IDH_START_QUERY, \
m_doc->numIdentifiers() > 1); @@ -913,7 +913,7 @@
}
}
- header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), \
query_m, (3 << 16) | IDH_NULL); + header_m->insertItem(KIcon("run_query"), \
i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL);
connect (query_m, SIGNAL(activated(int)), this, \
SLOT(slotHeaderCallBack(int)));
connect (query_m, SIGNAL(highlighted(int)), this, \
SLOT(slotHeaderStatus(int)));
@@ -930,7 +930,7 @@
multiple_m->insertItem(i18n("From %1", m_doc->identifier(i)), (i << \
(16+8)) | IDH_START_MULTIPLE); }
}
- header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple \
Choice"), multiple_m, (4 << 16) | IDH_NULL); + \
header_m->insertItem(KIcon("run_multi"), i18n("Create &Multiple Choice"), multiple_m, \
(4 << 16) | IDH_NULL); header_m->insertSeparator();
header_m->insertItem(i18n("Train &Verbs"), (header << 16) | IDH_START_VERB);
@@ -961,8 +961,8 @@
}
learn_menu->insertSeparator();
- learn_menu->insertItem(SmallIconSet("run_query"), i18n("Resume &Query"), \
ID_RESUME_QUERY );
- learn_menu->insertItem(SmallIconSet("run_multi"), i18n("Resume &Multiple Choice"), \
ID_RESUME_MULTIPLE ); + learn_menu->insertItem(KIcon("run_query"), i18n("Resume \
&Query"), ID_RESUME_QUERY ); + learn_menu->insertItem(KIcon("run_multi"), \
i18n("Resume &Multiple Choice"), ID_RESUME_MULTIPLE );
learn_menu->setItemEnabled(ID_RESUME_QUERY, query_num != 0);
learn_menu->setItemEnabled(ID_RESUME_MULTIPLE, query_num != 0);
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp #625842:625843
@@ -140,6 +140,7 @@
if (mqtime > 0) {
if (qtimer == 0) {
qtimer = new QTimer( this );
+ qtimer->setSingleShot(true);
connect( qtimer, SIGNAL(timeout()), this, SLOT(timeoutReached()) );
}
@@ -147,7 +148,7 @@
timercount = mqtime;
mw->timebar->setMaximum(timercount);
mw->timebar->setValue(timercount);
- qtimer->start(1000, true);
+ qtimer->start(1000);
}
else
mw->timebar->setEnabled(false);
@@ -219,7 +220,7 @@
if (timercount > 0) {
timercount--;
mw->timebar->setValue(timercount);
- qtimer->start(1000, true);
+ qtimer->start(1000);
}
if (timercount <= 0) {
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp #625842:625843
@@ -161,6 +161,7 @@
if (mqtime > 0) {
if (qtimer == 0) {
qtimer = new QTimer( this );
+ qtimer->setSingleShot(true);
connect( qtimer, SIGNAL(timeout()), this, SLOT(timeoutReached()) );
}
@@ -168,7 +169,7 @@
timercount = mqtime;
mw->timebar->setMaximum(timercount);
mw->timebar->setValue(timercount);
- qtimer->start(1000, true);
+ qtimer->start(1000);
}
else
mw->timebar->setEnabled(false);
@@ -256,7 +257,7 @@
if (timercount > 0) {
timercount--;
mw->timebar->setValue(timercount);
- qtimer->start(1000, true);
+ qtimer->start(1000);
}
if (timercount <= 0) {
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp #625842:625843
@@ -123,6 +123,7 @@
if (mqtime > 0) {
if (qtimer == 0) {
qtimer = new QTimer( this );
+ qtimer->setSingleShot(true);
connect( qtimer, SIGNAL(timeout()), this, SLOT(timeoutReached()) );
}
@@ -130,7 +131,7 @@
timercount = mqtime;
mw->timebar->setMaximum(timercount);
mw->timebar->setValue(timercount);
- qtimer->start(1000, true);
+ qtimer->start(1000);
}
else
mw->timebar->setEnabled(false);
@@ -352,7 +353,7 @@
if (timercount > 0) {
timercount--;
mw->timebar->setValue(timercount);
- qtimer->start(1000, true);
+ qtimer->start(1000);
}
if (timercount <= 0) {
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp \
#625842:625843 @@ -171,25 +171,30 @@
{
for ( i = 0; i < fields; i ++ )
{
- transCombos.append (new QComboBox (false, mw->TranslationFrame, QByteArray \
("transCombo") + QByteArray().setNum (i)));
- transCombos.at(i) -> setSizePolicy (QSizePolicy ((QSizePolicy::SizeType)7, \
(QSizePolicy::SizeType)1, 0, 0, transCombos.at(i) -> \
sizePolicy().hasHeightForWidth()));
- transCombos.at(i) -> setEditable (true);
- transCombos.at(i) -> setInsertPolicy (QComboBox::NoInsert);
- transCombos.at(i) -> setDuplicatesEnabled (false);
- vb->addWidget(transCombos.at(i));
- connect (transCombos.at(i), SIGNAL (textChanged (const QString&)), SLOT \
(slotTransChanged (const QString&)));
- connect (transCombos.at(i) -> lineEdit(), SIGNAL (lostFocus()), SLOT \
(slotTransLostFocus())); + QComboBox * combo = new QComboBox \
(mw->TranslationFrame); + transCombos.append ( combo );
+ combo -> setObjectName (QString ("transCombo%1").arg(i));
+ combo -> setEditable(false);
+ combo -> setSizePolicy (QSizePolicy ((QSizePolicy::SizeType)7, \
(QSizePolicy::SizeType)1, 0, 0, combo -> sizePolicy().hasHeightForWidth())); + \
combo -> setEditable (true); + combo -> setInsertPolicy (QComboBox::NoInsert);
+ combo -> setDuplicatesEnabled (false);
+ vb->addWidget(combo);
+ connect (combo, SIGNAL (textChanged (const QString&)), SLOT (slotTransChanged \
(const QString&))); + connect (combo -> lineEdit(), SIGNAL (lostFocus()), SLOT \
(slotTransLostFocus())); }
}
else
{
for ( i = 0; i < fields; i ++ )
{
- transFields.append (new QLineEdit (mw->TranslationFrame, QByteArray \
("transField") + QByteArray().setNum (i)));
- transFields.at(i) -> setSizePolicy (QSizePolicy ((QSizePolicy::SizeType)7, \
(QSizePolicy::SizeType)1, 0, 0, transFields.at(i) -> \
sizePolicy().hasHeightForWidth()));
- vb->addWidget(transFields.at(i));
- connect (transFields.at(i), SIGNAL (textChanged (const QString&)), SLOT \
(slotTransChanged (const QString&)));
- connect (transFields.at(i), SIGNAL (lostFocus()), SLOT \
(slotTransLostFocus())); + QLineEdit * line = new QLineEdit \
(mw->TranslationFrame); + transFields.append (line);
+ line -> setObjectName (QString ("transField%1").arg(i));
+ line -> setSizePolicy (QSizePolicy ((QSizePolicy::SizeType)7, \
(QSizePolicy::SizeType)1, 0, 0, line -> sizePolicy().hasHeightForWidth())); + \
vb->addWidget(line); + connect (line, SIGNAL (textChanged (const QString&)), \
SLOT (slotTransChanged (const QString&))); + connect (line, SIGNAL \
(lostFocus()), SLOT (slotTransLostFocus())); }
}
@@ -325,6 +330,7 @@
if (mqtime > 0) {
if (qtimer == 0) {
qtimer = new QTimer( this );
+ qtimer->setSingleShot(true);
connect( qtimer, SIGNAL(timeout()), this, SLOT(timeoutReached()) );
}
@@ -332,7 +338,7 @@
timercount = mqtime;
mw->timebar->setMaximum(timercount);
mw->timebar->setValue(timercount);
- qtimer->start(1000, true);
+ qtimer->start(1000);
}
else
mw->timebar->setEnabled(false);
@@ -532,7 +538,7 @@
if (timercount > 0) {
timercount--;
mw->timebar->setValue(timercount);
- qtimer->start(1000, true);
+ qtimer->start(1000);
}
if (timercount <= 0) {
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp \
#625842:625843 @@ -176,6 +176,7 @@
if (mqtime > 0) {
if (qtimer == 0) {
qtimer = new QTimer( this );
+ qtimer->setSingleShot(true);
connect( qtimer, SIGNAL(timeout()), this, SLOT(timeoutReached()) );
}
@@ -183,7 +184,7 @@
timercount = mqtime;
mw->timebar->setMaximum(timercount);
mw->timebar->setValue(timercount);
- qtimer->start(1000, true);
+ qtimer->start(1000);
}
else
mw->timebar->setEnabled(false);
@@ -206,7 +207,7 @@
if (timercount > 0) {
timercount--;
mw->timebar->setValue(timercount);
- qtimer->start(1000, true);
+ qtimer->start(1000);
}
if (timercount <= 0) {
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp \
#625842:625843 @@ -150,6 +150,7 @@
if (mqtime > 0) { // more than 1000 milli-seconds
if (qtimer == 0) {
qtimer = new QTimer( this );
+ qtimer->setSingleShot(true);
connect( qtimer, SIGNAL(timeout()), this, SLOT(timeoutReached()) );
}
@@ -157,7 +158,7 @@
timercount = mqtime;
mw->timebar->setMaximum(timercount);
mw->timebar->setValue(timercount);
- qtimer->start(1000, true);
+ qtimer->start(1000);
}
else
mw->timebar->setEnabled(false);
@@ -348,7 +349,7 @@
if (timercount > 0) {
timercount--;
mw->timebar->setValue(timercount);
- qtimer->start(1000, true);
+ qtimer->start(1000);
}
if (timercount <= 0) {
@@ -370,7 +371,7 @@
}
else if (Prefs::queryTimeout() == Prefs::EnumQueryTimeout::Continue) {
next();
- qtimer->start(1000, true);
+ qtimer->start(1000);
timercount = Prefs::maxTimePer();
}
}
@@ -398,7 +399,7 @@
if (current >= (int) conjugations.numEntries()-1 )
emit sigQueryChoice (Unknown);
else {
- qtimer->start(1000, true);
+ qtimer->start(1000);
timercount = Prefs::maxTimePer();
next();
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic