From 9d10ba5b23f6c4abc8ab6eca4558e0aac1f793ae Mon Sep 17 00:00:00 2001 From: Peter Hedlund Date: Sun, 16 Oct 2005 20:44:05 +0000 Subject: [PATCH] Initial port of KWordQuiz to Qt4/KDE4. It compiles and runs, but a lot of work remains. svn path=/branches/work/kwordquiz/src/prefleitner.h; revision=471217 --- kwordquiz/keduvocdocument.cpp | 36 +-- kwordquiz/keduvocdocument.h | 21 +- kwordquiz/keduvocexpression.h | 24 +- kwordquiz/keduvocgrammar.cpp | 8 +- kwordquiz/keduvocgrammar.h | 6 +- kwordquiz/keduvockvtmlreader.cpp | 10 +- kwordquiz/keduvockvtmlreader.h | 4 +- kwordquiz/keduvockvtmlwriter.cpp | 6 +- kwordquiz/keduvockvtmlwriter.h | 4 +- kwordquiz/keduvocwqlwriter.h | 2 + kwordquiz/leitnersystem.cpp | 8 +- kwordquiz/leitnersystem.h | 6 +- kwordquiz/leitnersystemview.cpp | 12 +- kwordquiz/leitnersystemview.h | 8 +- kwordquiz/prefleitner.cpp | 15 +- kwordquiz/prefleitner.h | 6 +- kwordquiz/prefleitnerbase.ui | 408 ++++++++++++------------------- 17 files changed, 259 insertions(+), 325 deletions(-) diff --git a/kwordquiz/keduvocdocument.cpp b/kwordquiz/keduvocdocument.cpp index f139bde..6189453 100644 --- a/kwordquiz/keduvocdocument.cpp +++ b/kwordquiz/keduvocdocument.cpp @@ -18,6 +18,10 @@ #include "keduvocdocument.h" #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -100,7 +104,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/) if (KIO::NetAccess::download( url, tmpfile, 0 )) { QFile f(tmpfile); - if (!f.open(IO_ReadOnly)) + if (!f.open(QIODevice::ReadOnly)) { KMessageBox::error(0, i18n("Cannot open file
%1
").arg(url.path())); return false; @@ -111,7 +115,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/) bool read = false; while (!read) { - QApplication::setOverrideCursor( waitCursor ); + QApplication::setOverrideCursor( Qt::WaitCursor ); switch (ft) { case kvtml: { @@ -213,13 +217,13 @@ bool KEduVocDocument::saveAs(QObject *parent, const KURL & url, FileType ft, con QFile f(tmp.path()); - if (!f.open(IO_WriteOnly)) + if (!f.open(QIODevice::WriteOnly)) { KMessageBox::error(0, i18n("Cannot write to file
%1
").arg(tmp.path())); return false; } - QApplication::setOverrideCursor( waitCursor ); + QApplication::setOverrideCursor(Qt::WaitCursor); switch (ft) { case kvtml: { KEduVocKvtmlWriter kvtmlWriter(&f); @@ -495,8 +499,8 @@ void KEduVocDocument::removeIdentifier(int index) { if (index < (int)m_identifiers.size() && index >= 1 ) { - m_identifiers.erase(m_identifiers.at(index)); - QValueList::iterator it; + m_identifiers.takeAt(index); + Q3ValueList::iterator it; for (it = m_vocabulary.begin(); it != m_vocabulary.end(); ++it) (*it).removeTranslation(index); } @@ -661,7 +665,7 @@ bool KEduVocDocument::sort(int index) sortAscending = m_sortIdentifier[index]; sortIndex = index; - qHeapSort(m_vocabulary); + ///@todo port qStableSort(m_vocabulary); m_sortIdentifier[index] = !m_sortIdentifier[index]; result = m_sortIdentifier[index]; } @@ -838,7 +842,7 @@ public: void KEduVocDocument::resetEntry(int index, int lesson) { - QValueList::iterator it; + Q3ValueList::iterator it; if (index < 0) { for (it = m_vocabulary.begin(); it != m_vocabulary.end(); ++it) @@ -893,9 +897,9 @@ QString KEduVocDocument::lessonDescription(int idx) const } -QValueList KEduVocDocument::lessonsInQuery() const +Q3ValueList KEduVocDocument::lessonsInQuery() const { - QValueList iqvec; + Q3ValueList iqvec; for (unsigned i = 0; i < m_lessonsInQuery.size(); i++) if (m_lessonsInQuery[i]) { iqvec.push_back(i+1); // Offset @@ -905,7 +909,7 @@ QValueList KEduVocDocument::lessonsInQuery() const } -void KEduVocDocument::setLessonsInQuery(QValueList lesson_iq) +void KEduVocDocument::setLessonsInQuery(Q3ValueList lesson_iq) { m_lessonsInQuery.clear(); for (unsigned i = 0; i < m_lessonDescriptions.size(); i++) @@ -1025,7 +1029,7 @@ int KEduVocDocument::search(QString substr, int id, int first, int last, bool wo KEduVocDocument::FileType KEduVocDocument::detectFileType(const QString &filename) { QFile f( filename ); - if (!f.open( IO_ReadOnly )) + if (!f.open( QIODevice::ReadOnly )) return csv; QDataStream is( &f ); @@ -1099,18 +1103,18 @@ public: KEduVocExpression *exp; }; -typedef QValueList ExpRefList; +typedef Q3ValueList ExpRefList; int KEduVocDocument::cleanUp() { int count = 0; KEduVocExpression *kve1, *kve2; ExpRefList shadow; - QValueList to_delete; + Q3ValueList to_delete; for (int i = 0; i < (int) m_vocabulary.size(); i++) shadow.push_back (ExpRef (entry(i), i)); - qHeapSort(shadow.begin(), shadow.end()); + ///@todo port qStableSort(shadow.begin(), shadow.end()); #ifdef CLEAN_BUG ofstream sso ("shadow.out"); @@ -1155,7 +1159,7 @@ int KEduVocDocument::cleanUp() f_ent_percent = to_delete.size () / 100.0; emit progressChanged(this, 0); - qHeapSort(to_delete.begin(), to_delete.end()); + ///@todo port qStableSort(to_delete.begin(), to_delete.end()); //std::sort (to_delete.begin(), to_delete.end() ); for (int i = (int) to_delete.size()-1; i >= 0; i--) { ent_no++; diff --git a/kwordquiz/keduvocdocument.h b/kwordquiz/keduvocdocument.h index 00ee84f..c41400a 100644 --- a/kwordquiz/keduvocdocument.h +++ b/kwordquiz/keduvocdocument.h @@ -233,6 +233,9 @@ #include #include +//Added by qt3to4: +#include +#include #include #include "keduvocexpression.h" @@ -544,10 +547,10 @@ class KEduVocDocument : public QObject QString lessonDescription(int index) const; /** returns lessons in current query */ - QValueList lessonsInQuery() const; + Q3ValueList lessonsInQuery() const; /** sets lessons in current query */ - void setLessonsInQuery(QValueList); + void setLessonsInQuery(Q3ValueList); inline QStringList lessonDescriptions() const { return m_lessonDescriptions; } @@ -651,7 +654,7 @@ protected: private: bool m_dirty; KURL m_url; - QValueList m_sortIdentifier; + Q3ValueList m_sortIdentifier; bool m_sortLesson; bool m_unknownAttribute; bool m_unknownElement; @@ -662,15 +665,15 @@ protected: int m_cols; int m_lines; int m_currentLesson; - QValueList m_extraSizeHints; - QValueList m_sizeHints; + Q3ValueList m_extraSizeHints; + Q3ValueList m_sizeHints; QFont* m_font; QString m_generator; QString m_queryorg; QString m_querytrans; - QValueList m_vocabulary; - QValueList m_lessonsInQuery; + Q3ValueList m_vocabulary; + Q3ValueList m_lessonsInQuery; QStringList m_lessonDescriptions; QStringList m_typeDescriptions; QStringList m_tenseDescriptions; @@ -681,8 +684,8 @@ protected: QString m_remark; QString m_version; - QValueList m_articles; - QValueList m_conjugations; + Q3ValueList m_articles; + Q3ValueList m_conjugations; LeitnerSystem* m_leitnerSystem; bool m_activeLeitnerSystem; diff --git a/kwordquiz/keduvocexpression.h b/kwordquiz/keduvocexpression.h index 0782dd3..1a81a51 100644 --- a/kwordquiz/keduvocexpression.h +++ b/kwordquiz/keduvocexpression.h @@ -47,7 +47,7 @@ #define KV_LEV7_GRADE 7 #define KV_LEV7_TEXT I18N_NOOP("Level 7") -#include +#include #include #include @@ -446,17 +446,17 @@ class KEduVocExpression QStringList m_example; QStringList m_antonym; QStringList m_pronounciations; - QValueList m_grades; - QValueList m_reverseGrades; - QValueList m_queryCounts; - QValueList m_reverseQueryCounts; - QValueList m_badCounts; - QValueList m_reverseBadCounts; - QValueList m_queryDates; - QValueList m_reverseQueryDates; - QValueList m_conjugations; - QValueList m_comparisons; - QValueList m_multipleChoices; + Q3ValueList m_grades; + Q3ValueList m_reverseGrades; + Q3ValueList m_queryCounts; + Q3ValueList m_reverseQueryCounts; + Q3ValueList m_badCounts; + Q3ValueList m_reverseBadCounts; + Q3ValueList m_queryDates; + Q3ValueList m_reverseQueryDates; + Q3ValueList m_conjugations; + Q3ValueList m_comparisons; + Q3ValueList m_multipleChoices; QString m_leitnerBox; int m_lesson; diff --git a/kwordquiz/keduvocgrammar.cpp b/kwordquiz/keduvocgrammar.cpp index 09ddce4..a55c6f0 100644 --- a/kwordquiz/keduvocgrammar.cpp +++ b/kwordquiz/keduvocgrammar.cpp @@ -26,6 +26,8 @@ #include "keduvocgrammar.h" #include +//Added by qt3to4: +#include KEduVocConjugation::conjug_name_t KEduVocConjugation::names [] = @@ -142,9 +144,9 @@ int KEduVocConjugation::numEntries() const } -QValueList KEduVocConjugation::getRelation () +Q3ValueList KEduVocConjugation::getRelation () { - QValueList vec; + Q3ValueList vec; for (int i = 0; i < numInternalNames(); i++) { vec.append(KEduVocTenseRelation(names[i].abbrev, i18n(names[i].name))); @@ -169,7 +171,7 @@ void KEduVocConjugation::setTenseNames (QStringList names) QString KEduVocConjugation::getName (const QString &abbrev) { - if (abbrev.length() >= 2 && abbrev[0] == QString(UL_USER_TENSE)) { + if (abbrev.length() >= 2 && QString(abbrev[0]) == QString(UL_USER_TENSE)) { QString s = abbrev; s.remove(0, 1); int i = s.toInt() - 1; diff --git a/kwordquiz/keduvocgrammar.h b/kwordquiz/keduvocgrammar.h index 941c82f..bd1400f 100644 --- a/kwordquiz/keduvocgrammar.h +++ b/kwordquiz/keduvocgrammar.h @@ -28,7 +28,7 @@ #define grammarmanager_included #include -#include +#include #include #define CONJ_SIMPLE_PRESENT "PrSi" // I live at home what you frequently do @@ -127,7 +127,7 @@ public: int numEntries() const; - static QValueList getRelation (); + static Q3ValueList getRelation (); static void setTenseNames (QStringList names); static QString getName (const QString &abbrev); @@ -199,7 +199,7 @@ struct conjug_t }; protected: - typedef QValueList conjug_tList; + typedef Q3ValueList conjug_tList; conjug_tList conjugations; static conjug_name_t names []; diff --git a/kwordquiz/keduvockvtmlreader.cpp b/kwordquiz/keduvockvtmlreader.cpp index 93d0686..4de1229 100644 --- a/kwordquiz/keduvockvtmlreader.cpp +++ b/kwordquiz/keduvockvtmlreader.cpp @@ -22,6 +22,8 @@ #include #include +//Added by qt3to4: +#include #include "keduvockvtmlreader.h" #include "keduvocdocument.h" @@ -227,7 +229,7 @@ bool KEduVocKvtmlReader::readArticle(QDomElement &domElementParent) } -bool KEduVocKvtmlReader::readConjug(QDomElement &domElementParent, QValueList &curr_conjug, const QString &entry_tag) +bool KEduVocKvtmlReader::readConjug(QDomElement &domElementParent, Q3ValueList &curr_conjug, const QString &entry_tag) /* used in header for definiton of "prefix" lang determines also lang order in entries !! @@ -967,7 +969,7 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent) QString antonym; QString usage; QString paraphrase; - QValueList conjug; + Q3ValueList conjug; KEduVocComparison comparison; KEduVocMultipleChoice mc; @@ -1664,7 +1666,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const QString &elem) "read documents with unknown elements.\n" ); QString msg = format.arg(elem); - QApplication::setOverrideCursor( arrowCursor, true ); + QApplication::setOverrideCursor(Qt::ArrowCursor, true); QString s = kapp->makeStdCaption(i18n("Unknown element")); KMessageBox::sorry(0, ln+msg, s); QApplication::restoreOverrideCursor(); @@ -1672,7 +1674,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const QString &elem) void KEduVocKvtmlReader::domError(const QString &text ) { - QApplication::setOverrideCursor( arrowCursor, true ); + QApplication::setOverrideCursor(Qt::ArrowCursor, true); QString s = kapp->makeStdCaption(i18n("Error")); QString ln = i18n("File:\t%1\n").arg(m_doc->URL().path()); QString msg = text; diff --git a/kwordquiz/keduvockvtmlreader.h b/kwordquiz/keduvockvtmlreader.h index d42bb83..a9c8c3e 100644 --- a/kwordquiz/keduvockvtmlreader.h +++ b/kwordquiz/keduvockvtmlreader.h @@ -21,6 +21,8 @@ #include #include +//Added by qt3to4: +#include #include "keduvocdocument.h" #include "keduvocgrammar.h" @@ -78,7 +80,7 @@ public: bool readLesson(QDomElement &domElementParent); bool readArticle(QDomElement &domElementParent); - bool readConjug(QDomElement &domElementParent, QValueList &curr_conjug, const QString &entry_tag); + bool readConjug(QDomElement &domElementParent, Q3ValueList &curr_conjug, const QString &entry_tag); bool readOptions(QDomElement &domElementParent); bool readType(QDomElement &domElementParent); bool readTense(QDomElement &domElementParent); diff --git a/kwordquiz/keduvockvtmlwriter.cpp b/kwordquiz/keduvockvtmlwriter.cpp index 9d80bfe..6085ef2 100644 --- a/kwordquiz/keduvockvtmlwriter.cpp +++ b/kwordquiz/keduvockvtmlwriter.cpp @@ -19,6 +19,8 @@ #include #include #include +//Added by qt3to4: +#include #include "keduvockvtmlwriter.h" #include "keduvocdocument.h" @@ -243,7 +245,7 @@ bool KEduVocKvtmlWriter::saveConjug(QDomDocument &domDoc, QDomElement &domElemen } bool KEduVocKvtmlWriter::saveConjugHeader(QDomDocument &domDoc, QDomElement &domElementParent, - QValueList &curr_conjug) + Q3ValueList &curr_conjug) { /* used in header for definiton of "prefix" @@ -684,7 +686,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator return false; QString q_org, q_trans; - QValueList::const_iterator first = m_doc->m_vocabulary.begin (); + Q3ValueList::const_iterator first = m_doc->m_vocabulary.begin (); m_doc->queryLang(q_org, q_trans); int ent_no = 0; diff --git a/kwordquiz/keduvockvtmlwriter.h b/kwordquiz/keduvockvtmlwriter.h index 7748933..34959c9 100644 --- a/kwordquiz/keduvockvtmlwriter.h +++ b/kwordquiz/keduvockvtmlwriter.h @@ -21,6 +21,8 @@ #include #include +//Added by qt3to4: +#include //#include "keduvocdocument.h" #include "keduvocgrammar.h" @@ -79,7 +81,7 @@ public: bool saveOptionsKvtMl (QDomDocument &domDoc, QDomElement &domElementParent); bool saveArticleKvtMl (QDomDocument &domDoc, QDomElement &domElementParent); bool saveConjugHeader (QDomDocument &domDoc, QDomElement &domElementParent, - QValueList &curr_conjug); + Q3ValueList &curr_conjug); bool saveConjug (QDomDocument &domDoc, QDomElement &domElementParent, const KEduVocConjugation &curr_conjug, QString type); bool saveConjugEntry (QDomDocument &domDoc, QDomElement &domElementParent, diff --git a/kwordquiz/keduvocwqlwriter.h b/kwordquiz/keduvocwqlwriter.h index 98bc94f..96d6cd3 100644 --- a/kwordquiz/keduvocwqlwriter.h +++ b/kwordquiz/keduvocwqlwriter.h @@ -20,6 +20,8 @@ #include #include +//Added by qt3to4: +#include class KEduVocDocument; diff --git a/kwordquiz/leitnersystem.cpp b/kwordquiz/leitnersystem.cpp index 65661dd..10e94e7 100644 --- a/kwordquiz/leitnersystem.cpp +++ b/kwordquiz/leitnersystem.cpp @@ -11,8 +11,10 @@ // #include "leitnersystem.h" #include +//Added by qt3to4: +#include -LeitnerSystem::LeitnerSystem(QValueList& boxes, QString name) +LeitnerSystem::LeitnerSystem(Q3ValueList& boxes, QString name) { if( !boxes.empty() ) m_boxes = boxes; @@ -32,7 +34,7 @@ LeitnerSystem::~LeitnerSystem() QStringList LeitnerSystem::getBoxNameList() { QStringList boxNameList; - QValueList::iterator it; + Q3ValueList::iterator it; for(it = m_boxes.begin(); it != m_boxes.end(); ++it) @@ -55,7 +57,7 @@ LeitnerBox* LeitnerSystem::boxWithNumber( int number ) LeitnerBox* LeitnerSystem::boxWithName( const QString& name ) { - QValueList::iterator it; + Q3ValueList::iterator it; for(it = m_boxes.begin(); it != m_boxes.end(); ++it) { diff --git a/kwordquiz/leitnersystem.h b/kwordquiz/leitnersystem.h index 6e9be52..5122fde 100644 --- a/kwordquiz/leitnersystem.h +++ b/kwordquiz/leitnersystem.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include "leitnerbox.h" #ifndef LEITNERSYSTEM_H @@ -26,7 +26,7 @@ class LeitnerSystem { public: LeitnerSystem(); - LeitnerSystem( QValueList& boxes, QString name ); + LeitnerSystem( Q3ValueList& boxes, QString name ); ~LeitnerSystem(); @@ -72,7 +72,7 @@ public: private: QString m_systemName; //the systems name - QValueList m_boxes; + Q3ValueList m_boxes; }; #endif diff --git a/kwordquiz/leitnersystemview.cpp b/kwordquiz/leitnersystemview.cpp index f802ba7..261200f 100644 --- a/kwordquiz/leitnersystemview.cpp +++ b/kwordquiz/leitnersystemview.cpp @@ -17,11 +17,13 @@ #include #include #include +//Added by qt3to4: +#include #include -LeitnerSystemView::LeitnerSystemView(QWidget * parent, const char* name, WFlags f) - : QScrollView(parent, name, f) +LeitnerSystemView::LeitnerSystemView(QWidget * parent, const char* name, Qt::WFlags f) + : Q3ScrollView(parent, name, f) { m_highlightedBox = -1; } @@ -42,7 +44,7 @@ void LeitnerSystemView::drawSystem(QPainter* p) { //p->drawPixmap(12 + i * 64 + i*10, m_imageY, KGlobal::iconLoader()->loadIcon("leitnerbox", KIcon::Panel)); p->drawRect(12 + i * 64 + i*10, m_imageY,64,64); - p->fillRect(12 + i * 64 + i*10, m_imageY,64,64, QBrush(red)); + p->fillRect(12 + i * 64 + i*10, m_imageY,64,64, QBrush(Qt::red)); } else { //for each box 74 = 64(pixmap) + 10(distance between two boxes) @@ -59,7 +61,7 @@ void LeitnerSystemView::drawConnections(QPainter* p) int dist, width = 0; int numberOfBoxes = m_leitnerSystem->getNumberOfBoxes(); - p->setPen( QPen(green, 2) ); + p->setPen( QPen(Qt::green, 2) ); //paint the connections for the correct word boxes, above the boxes for(int i = 0; i < numberOfBoxes; i++) @@ -86,7 +88,7 @@ void LeitnerSystemView::drawConnections(QPainter* p) } //paint the connections for the wrong word boxes, below the boxes - p->setPen(QPen(red, 2)); + p->setPen(QPen(Qt::red, 2)); for(int i = 0; i < numberOfBoxes; i++) { diff --git a/kwordquiz/leitnersystemview.h b/kwordquiz/leitnersystemview.h index 8639463..5642b02 100644 --- a/kwordquiz/leitnersystemview.h +++ b/kwordquiz/leitnersystemview.h @@ -12,8 +12,10 @@ #ifndef LEITNERSYSTEMVIEW_H #define LEITNERSYSTEMVIEW_H -#include +#include #include +//Added by qt3to4: +#include class LeitnerSystem; @@ -22,12 +24,12 @@ class LeitnerSystem; @author Martin Pfeiffer */ -class LeitnerSystemView : public QScrollView +class LeitnerSystemView : public Q3ScrollView { Q_OBJECT public: - LeitnerSystemView(QWidget* parent = 0, const char* name = 0, WFlags f = 0); + LeitnerSystemView(QWidget* parent = 0, const char* name = 0, Qt::WFlags f = 0); ~LeitnerSystemView(); diff --git a/kwordquiz/prefleitner.cpp b/kwordquiz/prefleitner.cpp index 79ddd16..34961ba 100644 --- a/kwordquiz/prefleitner.cpp +++ b/kwordquiz/prefleitner.cpp @@ -21,16 +21,16 @@ #include -PrefLeitner::PrefLeitner(QWidget * parent, const char* name, WFlags f, LeitnerSystem* system) - : PrefLeitnerBase( parent, name, f ) +PrefLeitner::PrefLeitner(QWidget * parent, LeitnerSystem* system) : QDialog(parent) { - m_selectedSystem = system; + setupUi(this); + m_selectedSystem = system; m_selectedBox = 0; //create new leitnersystemview, show and connect it m_leitnerSystemView = new LeitnerSystemView( this, 0 ); - PrefLeitnerBaseLayout->addWidget( m_leitnerSystemView, 1, 0 ); - PrefLeitnerBaseLayout->setOrigin( QGridLayout::BottomLeft ); + ///@todo port PrefLeitnerBaseLayout->addWidget( m_leitnerSystemView, 1, 0 ); + ///@todo port PrefLeitnerBaseLayout->setOrigin( Qt::BottomLeftCorner ); connect( m_leitnerSystemView, SIGNAL( boxClicked( int ) ), this, SLOT( slotBoxClicked( int ) ) ); @@ -42,11 +42,6 @@ PrefLeitner::PrefLeitner(QWidget * parent, const char* name, WFlags f, LeitnerSy m_leitnerSystemView->setSystem( m_selectedSystem ); } - -PrefLeitner::~PrefLeitner() -{ -} - void PrefLeitner::slotCorrectWord( const QString& newBox ) { if( m_selectedBox == 0 ) diff --git a/kwordquiz/prefleitner.h b/kwordquiz/prefleitner.h index 09ecae1..da97f4e 100644 --- a/kwordquiz/prefleitner.h +++ b/kwordquiz/prefleitner.h @@ -21,15 +21,13 @@ class LeitnerBox; /** @author Martin Pfeiffer */ -class PrefLeitner : public PrefLeitnerBase +class PrefLeitner : public QDialog, public Ui::PrefLeitnerBase { Q_OBJECT public: - PrefLeitner(QWidget * parent, const char* name, WFlags f, LeitnerSystem* system); + PrefLeitner(QWidget * parent, LeitnerSystem* system); - ~PrefLeitner(); - LeitnerSystem* getSystem(); public slots: diff --git a/kwordquiz/prefleitnerbase.ui b/kwordquiz/prefleitnerbase.ui index 1a154c1..881381c 100644 --- a/kwordquiz/prefleitnerbase.ui +++ b/kwordquiz/prefleitnerbase.ui @@ -1,247 +1,163 @@ - -PrefLeitnerBase - - - PrefLeitnerBase - - - - 0 - 0 - 770 - 458 - - - - Leitner System - - - - unnamed - - - - layout5 - - - - unnamed - - - - btnApply - - - Appl&y Changes - - - Alt+Y - - - - - spacer2 - - - Horizontal - - - Expanding - - - - 421 - 20 - - - - - - lytBoxName - - - - unnamed - - - - lndBoxName - - - - - lblBoxName - - - Edit box name: - - - - - - - btnDiscard - - - Disc&ard Changes - - - Alt+A - - - - - btnAddBox - - - Add a bo&x - - - Alt+X - - - - - btnDeleteBox - - - Delete selected &box - - - Alt+B - - - - - lytWrongCorrect - - - - unnamed - - - - lblCorrect - - - - 0 - 255 - 0 - - - - Correct words to: - - - - - cmbCorrect - - - - - lblWrong - - - - 255 - 0 - 0 - - - - Wrong words to: - - - - - cmbWrong - - - - 253 - 253 - 253 - - - - - - - - spacer1 - - - Horizontal - - - Expanding - - - - 252 - 20 - - - - + + + + + PrefLeitnerBase + + + + 0 + 0 + 770 + 458 + + + + Leitner System + + + + 10 + + + 6 + + + + + 0 + + + 6 + + + + + Appl&y Changes + + + Alt+Y + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 421 + 20 + + + + + + + + 0 + + + 6 + + + + + + + + Edit box name: + - - - - - cmbCorrect - activated(const QString&) - PrefLeitnerBase - slotCorrectWord(const QString&) - - - cmbWrong - activated(const QString&) - PrefLeitnerBase - slotWrongWord(const QString&) - - - lndBoxName - textChanged(const QString&) - PrefLeitnerBase - slotBoxName(const QString&) - - - btnAddBox - clicked() - PrefLeitnerBase - slotAddBox() - - - btnDeleteBox - clicked() - PrefLeitnerBase - slotDeleteBox() - - - btnApply - clicked() - PrefLeitnerBase - slotDiscard() - - - btnDiscard - clicked() - PrefLeitnerBase - slotApply() - - - - slotBoxName(const QString&) - slotSystem(const QString&) - slotWrongWord(const QString&) - slotCorrectWord(const QString&) - slotAddBox() - slotDeleteBox() - slotDiscard() - slotApply() - - - + + + + + + + Disc&ard Changes + + + Alt+A + + + + + + + Add a bo&x + + + Alt+X + + + + + + + Delete selected &box + + + Alt+B + + + + + + + 0 + + + 6 + + + + + Correct words to: + + + + + + + + + + Wrong words to: + + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 252 + 20 + + + + + + + + + + qPixmapFromMimeSource + + + -- 2.47.3