From cd2c4fc4fba26e44ac437d679aef9e1c160f6a5c Mon Sep 17 00:00:00 2001 From: Vladislav Budin Date: Fri, 2 Jun 2023 13:06:02 +0300 Subject: [PATCH] Demostration variant 1 --- qt/Widgets/ImagesWidget/ImagesWidget.cpp | 3 +++ qt/Widgets/MainWindow/mainwindow.cpp | 12 ++++++++---- qt/Widgets/MainWindow/mainwindow.h | 2 ++ qt/Widgets/MainWindow/mainwindow.ui | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/qt/Widgets/ImagesWidget/ImagesWidget.cpp b/qt/Widgets/ImagesWidget/ImagesWidget.cpp index 9d7f8c8..fb31340 100644 --- a/qt/Widgets/ImagesWidget/ImagesWidget.cpp +++ b/qt/Widgets/ImagesWidget/ImagesWidget.cpp @@ -164,6 +164,9 @@ Media ImagesWidget::getChosenImages() { if (!pushButton) { continue; } + if (!pushButton->isChecked()) { + continue; + } SourceWithAdditionalInfo image; bool isLocal = pushButton->property("isLocal").toBool(); image.src = pushButton->property("src").toString().toStdString(); diff --git a/qt/Widgets/MainWindow/mainwindow.cpp b/qt/Widgets/MainWindow/mainwindow.cpp index 3a0bcda..4585263 100644 --- a/qt/Widgets/MainWindow/mainwindow.cpp +++ b/qt/Widgets/MainWindow/mainwindow.cpp @@ -18,11 +18,13 @@ #include "WordPluginWrapper.h" #include "FormatProcessorPluginWrapper.h" #include "ServerConnection.h" +#include #include #include #include #include #include +#include MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) @@ -116,6 +118,7 @@ void MainWindow::updateTags(const Card *card) if (!card) { return; } + currentTags = card->tags; ui->tagsLine->setText(QString::fromStdString(parse_tags(card->tags))); } @@ -170,11 +173,11 @@ void MainWindow::onPrevClicked() void MainWindow::onAddClicked() { Card card; card.word = ui->wordLine->text().toStdString(); - // card.tags = ui->tagsLine->text().toStdString(); + card.tags = currentTags; card.definition = ui->definitionEdit->toPlainText().toStdString(); - card.examples = sentencesWidget->getSentences(); - card.audios = audiosWidget->getAudios(); - card.images = imagesWidget->getImages(); + card.examples = sentencesWidget->getChosenSentences(); + card.audios = audiosWidget->getChosenAudio(); + card.images = imagesWidget->getChosenImages(); savedDeck.push_back(card); onNextClicked(); } @@ -186,4 +189,5 @@ void MainWindow::save() { FormatProcessorPluginWrapper savingPlugin(connection); savingPlugin.init("processor"); savingPlugin.save(absolute_path); + exit(0); } diff --git a/qt/Widgets/MainWindow/mainwindow.h b/qt/Widgets/MainWindow/mainwindow.h index 87b2194..bce9b5e 100644 --- a/qt/Widgets/MainWindow/mainwindow.h +++ b/qt/Widgets/MainWindow/mainwindow.h @@ -2,6 +2,7 @@ #define MAINWINDOW_H #include +#include #include "deck_model.h" #include "Card.h" #include "AudiosWidget.hpp" @@ -46,5 +47,6 @@ private: AudiosWidget* audiosWidget; ImagesWidget* imagesWidget; QModelIndex current_index; + nlohmann::json currentTags; }; #endif // MAINWINDOW_H diff --git a/qt/Widgets/MainWindow/mainwindow.ui b/qt/Widgets/MainWindow/mainwindow.ui index c33233e..8c6b287 100644 --- a/qt/Widgets/MainWindow/mainwindow.ui +++ b/qt/Widgets/MainWindow/mainwindow.ui @@ -56,7 +56,7 @@ - Save + Save and quit -- GitLab