diff --git a/keduvocdocument/CMakeLists.txt b/keduvocdocument/CMakeLists.txt index bc7f82c..a4b9d31 100644 --- a/keduvocdocument/CMakeLists.txt +++ b/keduvocdocument/CMakeLists.txt @@ -1,193 +1,196 @@ 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 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 ) 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 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/keduvocmultiplechoicewidget.cpp b/keduvocdocument/keduvocmultiplechoicewidget.cpp new file mode 100644 index 0000000..04f94eb --- /dev/null +++ b/keduvocdocument/keduvocmultiplechoicewidget.cpp @@ -0,0 +1,159 @@ +/*************************************************************************** + + copyright : (C) 1999-2001 Ewald Arnold + (C) 2005-2007 Peter Hedlund + (C) 2007 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. * + * * + ***************************************************************************/ + +#include "keduvocmultiplechoicewidget.h" + +#include "ui_keduvocmultiplechoicewidget.h" + +#include +#include +#include + +#include +#include +#include +#include + +using namespace Editor; + +class KEduVocMultipleChoiceWidget::Private +{ +public: + Private(); + + KEduVocTranslation* m_translation; + QStringListModel * m_choicesModel; + + Ui::KEduVocMultipleChoiceWidget * m_ui; +}; + +KEduVocMultipleChoiceWidget::Private::Private() +{ + m_ui = new Ui::KEduVocMultipleChoiceWidget(); +} + +KEduVocMultipleChoiceWidget::KEduVocMultipleChoiceWidget( QWidget *parent ) + : QWidget( parent ) + , d( new Private ) +{ + d->m_ui->setupUi( this ); + + connect( d->m_ui->addChoiceButton, &QPushButton::clicked, this, &KEduVocMultipleChoiceWidget::slotAddChoiceButton ); + connect( d->m_ui->removeChoiceButton, &QPushButton::clicked, this, &KEduVocMultipleChoiceWidget::slotRemoveChoiceButton); + + d->m_choicesModel = new QStringListModel( this ); + d->m_ui->multipleChoiceListView->setModel( d->m_choicesModel ); + + connect( d->m_choicesModel, &QStringListModel::dataChanged, this, &KEduVocMultipleChoiceWidget::slotDataChanged ); + + d->m_ui->multipleChoiceListView->setAcceptDrops( true ); + d->m_ui->multipleChoiceListView->installEventFilter( this ); + + setEnabled( false ); +} + +KEduVocMultipleChoiceWidget::~KEduVocMultipleChoiceWidget() +{ + delete d; +} + +void KEduVocMultipleChoiceWidget::slotDataChanged( const QModelIndex & topLeft, const QModelIndex & bottomRight ) +{ + Q_UNUSED( topLeft ) + Q_UNUSED( bottomRight ) + d->m_translation->multipleChoice() = d->m_choicesModel->stringList(); + d->m_ui->removeChoiceButton->setEnabled( d->m_translation && d->m_translation->multipleChoice().count() > 0 ); +} + + +void KEduVocMultipleChoiceWidget::setTranslation( KEduVocExpression * entry, int translation ) +{ + if( entry ) { + d->m_translation = entry->translation( translation ); + } else { + d->m_translation = 0; + } + + if( d->m_translation ) { + setEnabled(true); + d->m_choicesModel->setStringList( d->m_translation->multipleChoice() ); + d->m_ui->removeChoiceButton->setEnabled( d->m_translation->multipleChoice().count() > 0 ); + } else { + setEnabled(false); + } + d->m_ui->removeChoiceButton->setEnabled( d->m_translation && d->m_translation->multipleChoice().count() > 0 ); +} + + +void KEduVocMultipleChoiceWidget::slotAddChoiceButton() +{ + d->m_choicesModel->insertRow( d->m_choicesModel->rowCount() ); + QModelIndex index( d->m_choicesModel->index( d->m_choicesModel->rowCount() - 1 ) ); + d->m_choicesModel->setData( index, "" ); + d->m_ui->multipleChoiceListView->scrollTo( index ); + d->m_ui->multipleChoiceListView->setCurrentIndex( index ); + d->m_ui->multipleChoiceListView->edit( index ); +} + + +void KEduVocMultipleChoiceWidget::slotRemoveChoiceButton() +{ + QModelIndex index = d->m_ui->multipleChoiceListView->selectionModel()->currentIndex(); + if( index.isValid() ) { + d->m_choicesModel->removeRows( index.row(), 1, QModelIndex() ); + } else { + d->m_choicesModel->removeRows( d->m_choicesModel->rowCount( QModelIndex() ) - 1, 1, QModelIndex() ); + } + d->m_translation->multipleChoice() = d->m_choicesModel->stringList(); + d->m_ui->removeChoiceButton->setEnabled( d->m_translation && d->m_translation->multipleChoice().count() > 0 ); +} + + +bool KEduVocMultipleChoiceWidget::eventFilter( QObject * obj, QEvent * event ) +{ + if( obj == d->m_ui->multipleChoiceListView ) { + if( event->type() == QEvent::DragEnter ) { + QDragEnterEvent *dragEnterEvent = static_cast( event ); + //qDebug() << "DragEnter mime format: " << dragEnterEvent->format(); + if( ( dragEnterEvent->mimeData() != NULL ) && dragEnterEvent->mimeData()->hasText() ) { + event->accept(); + } + return true; + } + + if( event->type() == QEvent::DragMove ) { + event->accept(); + return true; + } + + if( event->type() == QEvent::Drop ) { + QDropEvent *dropEvent = static_cast( event ); + //qDebug() << "You dropped onto me: " << dropEvent->mimeData()->text(); + if( ( dropEvent->mimeData() != NULL ) && dropEvent->mimeData()->hasText() ) { + + QStringList choices = dropEvent->mimeData()->text().split('\n'); + foreach( const QString & choice, choices ) { + d->m_choicesModel->insertRow( d->m_ui->multipleChoiceListView->model()->rowCount() ); + d->m_choicesModel->setData( d->m_choicesModel->index( d->m_ui->multipleChoiceListView->model()->rowCount() - 1 ), choice ); + } + + return true; + } + } + } + return QObject::eventFilter( obj, event ); +} diff --git a/keduvocdocument/keduvocmultiplechoicewidget.h b/keduvocdocument/keduvocmultiplechoicewidget.h new file mode 100644 index 0000000..17602e5 --- /dev/null +++ b/keduvocdocument/keduvocmultiplechoicewidget.h @@ -0,0 +1,66 @@ +/*************************************************************************** + + dialog page for multiple choice suggestions + + ----------------------------------------------------------------------- + + begin : Mon Oct 29 18:09:29 1999 + + copyright : (C) 1999-2001 Ewald Arnold + (C) 2005-2006 Peter Hedlund + (C) 2007 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 KEDUVOCMULTIPLECHOICEWIDGET_H +#define KEDUVOCMULTIPLECHOICEWIDGET_H + +#include +#include + +#include + +class KEduVocExpression; +class KEduVocTranslation; +class QStringListModel; + +namespace Editor +{ + +class KEDUVOCDOCUMENT_EXPORT KEduVocMultipleChoiceWidget : public QWidget +{ + Q_OBJECT + +public: + explicit KEduVocMultipleChoiceWidget( QWidget *parent = 0 ); + ~KEduVocMultipleChoiceWidget(); + +public slots: + void setTranslation( KEduVocExpression* entry, int translation ); + +protected: + bool eventFilter( QObject *obj, QEvent *event ); + +private slots: + void slotDataChanged( const QModelIndex & topLeft, const QModelIndex & bottomRight ); + void slotAddChoiceButton(); + void slotRemoveChoiceButton(); + +private: + class Private; + Private * const d; +}; +} + +#endif diff --git a/keduvocdocument/keduvocmultiplechoicewidget.ui b/keduvocdocument/keduvocmultiplechoicewidget.ui new file mode 100644 index 0000000..746b8df --- /dev/null +++ b/keduvocdocument/keduvocmultiplechoicewidget.ui @@ -0,0 +1,38 @@ + + KEduVocMultipleChoiceWidget + + + + 0 + 0 + 400 + 300 + + + + + + + + + + + + Add + + + + + + + Remove + + + + + + + + + +