diff --git a/keduvocdocument/CMakeLists.txt b/keduvocdocument/CMakeLists.txt index e0df6a1..891022f 100644 --- a/keduvocdocument/CMakeLists.txt +++ b/keduvocdocument/CMakeLists.txt @@ -1,199 +1,202 @@ if (BUILD_TESTING) add_subdirectory(autotests) add_subdirectory(tests) endif() ########### next target ############### include(ECMSetupVersion) ecm_setup_version(5.0.0 VARIABLE_PREFIX KDEEDU VERSION_HEADER "${CMAKE_BINARY_DIR}/keduvocdocument/keduvocdocument_version.h" PACKAGE_VERSION_FILE "${CMAKE_BINARY_DIR}/KEduVocDocumentVersion.cmake") include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) set(keduvocdocument_LIB_SRCS keduvocdocument.cpp keduvocidentifier.cpp keduvocexpression.cpp keduvoctranslation.cpp keduvoccontainer.cpp keduvoclesson.cpp keduvocleitnerbox.cpp keduvoctext.cpp keduvocarticle.cpp keduvocconjugation.cpp keduvocpersonalpronoun.cpp keduvocdeclension.cpp keduvocwordtype.cpp keduvockvtmlcompability.cpp keduvockvtml2writer.cpp keduvoccsvwriter.cpp keduvoccontainermodel.cpp keduvoclessonmodel.cpp keduvocreadonlycontainermodel.cpp keduvocvocabularymodel.cpp keduvocwordclassmodel.cpp keduvoccontainermimedata.cpp keduvocvocabularymimedata.cpp keduvocvocabularyfilter.cpp keduvoctranslator.cpp keduvocvocabularydelegate.cpp keduvocvocabularyheaderview.cpp keduvocvocabularycolumnsdialog.cpp keduvoccontainerview.cpp keduvocvocabularyview.cpp keduvocwordtypeview.cpp keduvoclessonview.cpp keduvocaudiowidget.cpp keduvocmultiplechoicewidget.cpp keduvoccomparisonwidget.cpp + keduvocdeclension.cpp readerwriters/dummyreader.cpp readerwriters/failedreader.cpp readerwriters/keduvockvtmlreader.cpp readerwriters/keduvockvtml2reader.cpp readerwriters/keduvoccsvreader.cpp readerwriters/keduvocpaukerreader.cpp readerwriters/keduvocvokabelnreader.cpp readerwriters/keduvocwqlreader.cpp readerwriters/keduvocxdxfreader.cpp readerwriters/readermanager.cpp sharedkvtmlfiles.cpp ) ki18n_wrap_ui(keduvocdocument_LIB_SRCS keduvocaudiowidget.ui keduvocmultiplechoicewidget.ui keduvoccomparisonwidget.ui + keduvocdeclensionwidget.ui ) include(ECMGenerateHeaders) ecm_generate_headers( KdeEdu_HEADERS HEADER_NAMES KEduVocDocument KEduVocIdentifier KEduVocExpression KEduVocText KEduVocArticle KEduVocConjugation KEduVocLesson KEduVocLeitnerBox KEduVocContainer KEduVocWordFlags KEduVocMultipleChoice KEduVocTranslation KEduVocWordtype KEduVocPersonalPronoun SharedKVTMLFiles KEduVocDeclension KEduVocKVTML2Writer KEduVocContainerModel KEduVocLessonModel KEduVocReadOnlyContainerModel KEduVocVocabularyModel KEduVocWordClassModel KEduVocContainerMimeData KEduVocVocabularyMimeData KEduVocVocabularyFilter KEduVocTranslator KEduVocVocabularyDelegate KEduVocVocabularyHeaderView KEduVocVocabularyColumnsDialog KEduVocContainerView KEduVocVocabularyView KEduVocWordTypeView KEduVocLessonView KEduVocAudioWidget KEduVocMultipleChoiceWidget KEduVocComparisonWidget + KEduVocDeclensionWidget REQUIRED_HEADERS KdeEdu_HEADERS ) add_library(KEduVocDocument SHARED ${keduvocdocument_LIB_SRCS}) generate_export_header(KEduVocDocument BASE_NAME KEduVocDocument) # vHanda: Add library alias? target_link_libraries(KEduVocDocument PUBLIC Qt5::Xml Qt5::Gui Qt5::Core Qt5::Widgets Qt5::DBus Qt5::Multimedia PRIVATE KF5::I18n KF5::KIOCore KF5::KIOFileWidgets KF5::KIOWidgets KF5::KIONTLM KF5::Archive KF5::Completion KF5::WidgetsAddons KF5::SonnetCore KF5::SonnetUi KF5::Notifications KF5::XmlGui ) # vHanda: Add Export Name? set_target_properties(KEduVocDocument PROPERTIES VERSION ${KDEEDU_VERSION_STRING} SOVERSION ${KDEEDU_SOVERSION} ) target_include_directories(KEduVocDocument INTERFACE "$") #Library for non-api unittests add_library(keduvocdocument_static STATIC ${keduvocdocument_LIB_SRCS}) set_target_properties(keduvocdocument_static PROPERTIES COMPILE_FLAGS -DKEDUVOCDOCUMENT_STATIC_DEFINE) target_link_libraries(keduvocdocument_static PUBLIC KF5::KIOCore Qt5::Xml Qt5::Core Qt5::Gui Qt5::Widgets Qt5::DBus Qt5::Multimedia PRIVATE KF5::I18n KF5::KIOCore KF5::KIOFileWidgets KF5::KIOWidgets KF5::KIONTLM KF5::Archive KF5::Completion KF5::WidgetsAddons KF5::SonnetCore KF5::SonnetUi KF5::Notifications KF5::XmlGui ) # if we want to set our own version instead of following kde generic #set(LIB_KEDUVOCDOCUMENT_VERSION "5.0.0") #set(LIB_KEDUVOCDOCUMENT_SOVERSION "5") #set_target_properties(keduvocdocument # PROPERTIES VERSION ${LIB_KEDUVOCDOCUMENT_VERSION} # SOVERSION ${LIB_KEDUVOCDOCUMENT_SOVERSION} #) install(TARGETS KEduVocDocument EXPORT LibKEduVocDocumentTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### install(FILES ${CMAKE_CURRENT_BINARY_DIR}/keduvocdocument_export.h ${KdeEdu_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/libkeduvocdocument COMPONENT Devel ) diff --git a/keduvocdocument/keduvocdeclensionwidget.cpp b/keduvocdocument/keduvocdeclensionwidget.cpp new file mode 100644 index 0000000..3fa1d52 --- /dev/null +++ b/keduvocdocument/keduvocdeclensionwidget.cpp @@ -0,0 +1,230 @@ +/*************************************************************************** + Copyright 2008 Frederik Gladhorn + Copyright 2011 Jan Gerrit Marker + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +#include "keduvocdeclensionwidget.h" + +#include "ui_keduvocdeclensionwidget.h" + +#include +#include +#include +#include + +#include +#include + +using namespace Editor; + +class KEduVocDeclensionWidget::Private +{ +public: + Private(); + + int m_identifier; + KEduVocExpression* m_entry; + KEduVocDocument* m_doc; + + /** + * All line edits and labels, index corresponding to KEduVocWordFlag::indexOf + */ + QMap< int, QLineEdit* > m_DeclensionLineEdits; + + Ui::KEduVocDeclensionWidget * m_ui; +}; + +KEduVocDeclensionWidget::Private::Private() +{ + m_doc = 0; + m_entry = 0; + m_identifier = -1; + m_ui = new Ui::KEduVocDeclensionWidget(); +} + +KEduVocDeclensionWidget::KEduVocDeclensionWidget( QWidget *parent ) + : QWidget(parent) + , d( new Private ) +{ + d->m_ui->setupUi( this ); + + d->m_ui->numberSelection->setItemData( 0, KEduVocWordFlag::Singular ); + d->m_ui->numberSelection->setItemData( 1, KEduVocWordFlag::Dual ); + d->m_ui->numberSelection->setItemData( 2, KEduVocWordFlag::Plural ); + connect( d->m_ui->numberSelection, static_cast( &QComboBox::currentIndexChanged ), this, &KEduVocDeclensionWidget::updateEntries ); + + connect( d->m_ui->nextButton, &QPushButton::clicked, this, &KEduVocDeclensionWidget::nextNumber ); + + setupLineEdits(); + + foreach( int index, d->m_DeclensionLineEdits.keys() ) { + connect( d->m_DeclensionLineEdits.value( index ), SIGNAL( textChanged( const QString& ) ), SLOT( textChanged( const QString& ) ) ); + } +} + +KEduVocDeclensionWidget::~KEduVocDeclensionWidget() +{ + delete d; +} + +void KEduVocDeclensionWidget::textChanged( const QString& text ) +{ + int valueIndex = d->m_DeclensionLineEdits.values().indexOf( qobject_cast( sender() ) ); + int key = d->m_DeclensionLineEdits.keys().value( valueIndex ) | currentAdditionalWordFlag(); + d->m_entry->translation( d->m_identifier )->declension()->setDeclension( text, ( KEduVocWordFlag::Flags )key ); + emit sigModified(); +} + + +void KEduVocDeclensionWidget::updateEntries() +{ + foreach( int key, d->m_DeclensionLineEdits.keys() ) { + d->m_DeclensionLineEdits.value( key )->setText( d->m_entry->translation( d->m_identifier )->declension()->declension( ( KEduVocWordFlag::Flags )( key | currentAdditionalWordFlag() ) ).text() ); + } +} + +void KEduVocDeclensionWidget::setTranslation( KEduVocExpression * entry, int identifier ) +{ + if( !d->m_doc ) { + return; + } + + d->m_entry = entry; + if( d.m_identifier != identifier ) { + d->m_identifier = identifier; + } + + if( !entry ) { + setEnabled( false ); + return; + } + + setupLineEdits(); + + setEnabled(true); + if( entry->translation( d->m_identifier )->wordType() ) { + KEduVocWordFlags wordType = entry->translation( d->m_identifier )->wordType()->wordType(); + if( wordType & KEduVocWordFlag::Noun || wordType & KEduVocWordFlag::Adjective ) { + + // we create declensions on demand. if empty it will simply not be saved. + // very little memory overhead, comfy to use ;) + if( !entry->translation( d->m_identifier )->declension() ) { + entry->translation( d->m_identifier )->setDeclension( new KEduVocDeclension ); + } + + updateEntries(); + } + } +} + +void KEduVocDeclensionWidget::setDocument( KEduVocDocument * doc ) +{ + d->m_doc = doc; +} + +int KEduVocDeclensionWidget::currentAdditionalWordFlag() +{ + if( d->m_entry->translation( d->m_identifier )->wordType()->wordType() & KEduVocWordFlag::Noun ) { + ///@todo easier and better way to get gender? + if( d->m_entry->translation( d->m_identifier )->wordType()->wordType() & KEduVocWordFlag::Feminine ) + return KEduVocWordFlag::Feminine; + if( d->m_entry->translation( d->m_identifier )->wordType()->wordType() & KEduVocWordFlag::Masculine ) + return KEduVocWordFlag::Masculine; + if( d->m_entry->translation( d->m_identifier )->wordType()->wordType() & KEduVocWordFlag::Neuter ) + return KEduVocWordFlag::Neuter; + } + + return d->m_ui->numberSelection->itemData( d->m_ui->numberSelection->currentIndex() ).toInt(); +} + +void KEduVocDeclensionWidget::nextNumber() +{ + int newIndex = d->m_ui->numberSelection->currentIndex() + 1; + if( newIndex >= d->m_ui->numberSelection->count() ) + newIndex = 0; + + d->m_ui->numberSelection->setCurrentIndex( newIndex ); +} + +void KEduVocDeclensionWidget::setupLineEdits() +{ + d->m_DeclensionLineEdits.clear(); + + if( d->m_entry == 0 || !d->m_entry->translation( d->m_identifier ) || !d->m_entry->translation( d->m_identifier )->wordType() + || d->m_entry->translation( d->m_identifier )->wordType()->wordType() & KEduVocWordFlag::Noun ) { + d->m_ui->label_3->setText( i18n( "Singular" ) ); + d->m_ui->label_4->setText( i18n( "Dual" ) ); + d->m_ui->label_5->setText( i18n( "Plural" ) ); + + /* Hide the GUI elements which are needed to switch the number */ + for( int i = 0; i < d->m_ui->numberLayout->count(); ++i ) { + d->m_ui->numberLayout->itemAt( i )->widget()->hide(); + } + + d->m_DeclensionLineEdits[ KEduVocWordFlag::Singular | KEduVocWordFlag::Nominative ] = d->m_ui->masculine_1; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Singular | KEduVocWordFlag::Genitive ] = d->m_ui->masculine_2; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Singular | KEduVocWordFlag::Dative ] = d->m_ui->masculine_3; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Singular | KEduVocWordFlag::Accusative ] = d->m_ui->masculine_4; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Singular | KEduVocWordFlag::Ablative ] = d->m_ui->masculine_5; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Singular | KEduVocWordFlag::Locative ] = d->m_ui->masculine_6; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Singular | KEduVocWordFlag::Vocative ] = d->m_ui->masculine_7; + + d->m_DeclensionLineEdits[ KEduVocWordFlag::Dual | KEduVocWordFlag::Nominative ] = d->m_ui->feminine_1; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Dual | KEduVocWordFlag::Genitive ] = d->m_ui->feminine_2; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Dual | KEduVocWordFlag::Dative ] = d->m_ui->feminine_3; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Dual | KEduVocWordFlag::Accusative ] = d->m_ui->feminine_4; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Dual | KEduVocWordFlag::Ablative ] = d->m_ui->feminine_5; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Dual | KEduVocWordFlag::Locative ] = d->m_ui->feminine_6; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Dual | KEduVocWordFlag::Vocative ] = d->m_ui->feminine_7; + + d->m_DeclensionLineEdits[ KEduVocWordFlag::Plural | KEduVocWordFlag::Nominative ] = d->m_ui->neuter_1; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Plural | KEduVocWordFlag::Genitive ] = d->m_ui->neuter_2; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Plural | KEduVocWordFlag::Dative ] = d->m_ui->neuter_3; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Plural | KEduVocWordFlag::Accusative ] = d->m_ui->neuter_4; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Plural | KEduVocWordFlag::Ablative ] = d->m_ui->neuter_5; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Plural | KEduVocWordFlag::Locative ] = d->m_ui->neuter_6; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Plural | KEduVocWordFlag::Vocative ] = d->m_ui->neuter_7; + } else { + d->m_ui->label_3->setText( i18n( "Masculine" ) ); + d->m_ui->label_4->setText( i18n( "Feminine" ) ); + d->m_ui->label_5->setText( i18n( "Neuter" ) ); + + /* Show the GUI elements which are needed to switch the number */ + for( int i = 0; i < d->m_ui->numberLayout->count(); ++i ) { + d->m_ui->numberLayout->itemAt(i)->widget()->show(); + } + + d->m_DeclensionLineEdits[ KEduVocWordFlag::Masculine | KEduVocWordFlag::Nominative ] = d->m_ui->masculine_1; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Masculine | KEduVocWordFlag::Genitive ] = d->m_ui->masculine_2; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Masculine | KEduVocWordFlag::Dative ] = d->m_ui->masculine_3; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Masculine | KEduVocWordFlag::Accusative ] = d->m_ui->masculine_4; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Masculine | KEduVocWordFlag::Ablative ] = d->m_ui->masculine_5; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Masculine | KEduVocWordFlag::Locative ] = d->m_ui->masculine_6; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Masculine | KEduVocWordFlag::Vocative ] = d->m_ui->masculine_7; + + d->m_DeclensionLineEdits[ KEduVocWordFlag::Feminine | KEduVocWordFlag::Nominative ] = d->m_ui->feminine_1; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Feminine | KEduVocWordFlag::Genitive ] = d->m_ui->feminine_2; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Feminine | KEduVocWordFlag::Dative ] = d->m_ui->feminine_3; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Feminine | KEduVocWordFlag::Accusative ] = d->m_ui->feminine_4; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Feminine | KEduVocWordFlag::Ablative ] = d->m_ui->feminine_5; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Feminine | KEduVocWordFlag::Locative ] = d->m_ui->feminine_6; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Feminine | KEduVocWordFlag::Vocative ] = d->m_ui->feminine_7; + + d->m_DeclensionLineEdits[ KEduVocWordFlag::Neuter | KEduVocWordFlag::Nominative ] = d->m_ui->neuter_1; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Neuter | KEduVocWordFlag::Genitive ] = d->m_ui->neuter_2; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Neuter | KEduVocWordFlag::Dative ] = d->m_ui->neuter_3; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Neuter | KEduVocWordFlag::Accusative ] = d->m_ui->neuter_4; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Neuter | KEduVocWordFlag::Ablative ] = d->m_ui->neuter_5; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Neuter | KEduVocWordFlag::Locative ] = d->m_ui->neuter_6; + d->m_DeclensionLineEdits[ KEduVocWordFlag::Neuter | KEduVocWordFlag::Vocative ] = d->m_ui->neuter_7; + } +} diff --git a/keduvocdocument/keduvocdeclensionwidget.h b/keduvocdocument/keduvocdeclensionwidget.h new file mode 100644 index 0000000..366857f --- /dev/null +++ b/keduvocdocument/keduvocdeclensionwidget.h @@ -0,0 +1,63 @@ +/*************************************************************************** + Copyright 2008 Frederik Gladhorn + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +#ifndef KEDUVOCDECLENSIONWIDGET_H +#define KEDUVOCDECLENSIONWIDGET_H + +#include + +#include +#include + +class KEduVocExpression; +class KEduVocDocument; + +namespace Editor +{ + +class KEDUVOCDOCUMENT_EXPORT KEduVocDeclensionWidget : public QWidget +{ + Q_OBJECT + +public: + explicit KEduVocDeclensionWidget( QWidget *parent = 0 ); + ~KEduVocDeclensionWidget(); + +public slots: + void setDocument( KEduVocDocument* doc ); + void setTranslation( KEduVocExpression* entry, int translation ); + + /** + * Fill the line edits + */ + void updateEntries(); + + void nextNumber(); + +signals: + void sigModified(); + +private slots: + void textChanged( const QString& ); + +private: + class Private; + Private * const d; + + int currentAdditionalWordFlag(); + void setupLineEdits(); +}; + +} + +#endif diff --git a/keduvocdocument/keduvocdeclensionwidget.ui b/keduvocdocument/keduvocdeclensionwidget.ui new file mode 100644 index 0000000..30bbd54 --- /dev/null +++ b/keduvocdocument/keduvocdeclensionwidget.ui @@ -0,0 +1,509 @@ + + + KEduVocDeclensionWidget + + + + 0 + 0 + 637 + 326 + + + + + 0 + 0 + + + + + 332 + 326 + + + + - + + + + + + + 0 + 0 + + + + Declension Forms + + + + + + + + + 0 + 0 + + + + Nominative + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + masculine_1 + + + + + + + + 0 + 0 + + + + Genitive + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + masculine_2 + + + + + + + + 0 + 0 + + + + Dative + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + masculine_3 + + + + + + + + 0 + 0 + + + + Accusative + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + masculine_4 + + + + + + + + 0 + 0 + + + + Ablative + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + masculine_5 + + + + + + + + 0 + 0 + + + + Locative + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + masculine_6 + + + + + + + + 0 + 0 + + + + Vocative + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + masculine_7 + + + + + + + + 0 + 0 + + + + Masculine + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + Feminine + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + Neuter + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + + + 0 + 0 + + + + Number: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + numberSelection + + + + + + + + Singular + + + + + Dual + + + + + Plural + + + + + + + + Next + + + + + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + + + + + + nextButton + numberSelection + + + +