This commit is contained in:
Gres 2020-03-05 20:47:38 +03:00
parent ad107834eb
commit 4d6f5857c0
4 changed files with 4 additions and 18 deletions

View File

@ -1,14 +1,10 @@
#include "settingseditor.h" #include "settingseditor.h"
#include "languagecodes.h" #include "languagecodes.h"
#include "settings.h"
#include "ui_settingseditor.h" #include "ui_settingseditor.h"
#include "widgetstate.h" #include "widgetstate.h"
#include <QDir>
#include <QFileDialog> #include <QFileDialog>
#include <QNetworkProxy> #include <QNetworkProxy>
#include <QRegExpValidator>
#include <QSettings>
#include <QStringListModel> #include <QStringListModel>
SettingsEditor::SettingsEditor() SettingsEditor::SettingsEditor()

View File

@ -9,22 +9,18 @@ class Task
public: public:
bool isNull() const { return captured.isNull() && !sourceLanguage.isEmpty(); } bool isNull() const { return captured.isNull() && !sourceLanguage.isEmpty(); }
bool isValid() const { return error.isEmpty(); } bool isValid() const { return error.isEmpty(); }
// void trace(const QString& message);
QPoint capturePoint; QPoint capturePoint;
QPixmap captured; QPixmap captured;
QString recognized; QString recognized;
QString translated{"sample"}; QString translated;
LanguageId sourceLanguage{"eng"}; LanguageId sourceLanguage;
LanguageId targetLanguage; //{"ru"}; LanguageId targetLanguage;
QStringList translators{"google.js"}; QStringList translators;
QString error; QString error;
// QStringList traceLog;
// bool swapLanguages;
}; };
using TaskPtr = std::shared_ptr<Task>; using TaskPtr = std::shared_ptr<Task>;

View File

@ -4,18 +4,13 @@
#include "settings.h" #include "settings.h"
#include "task.h" #include "task.h"
#include "webpage.h" #include "webpage.h"
#include "webpageproxy.h"
#include "widgetstate.h" #include "widgetstate.h"
#include <QBoxLayout> #include <QBoxLayout>
#include <QCloseEvent> #include <QCloseEvent>
#include <QFile>
#include <QSplitter> #include <QSplitter>
#include <QTabWidget> #include <QTabWidget>
#include <QTcpSocket>
#include <QTextEdit> #include <QTextEdit>
#include <QWebChannel>
#include <QWebEngineView>
#include <unordered_set> #include <unordered_set>

View File

@ -25,7 +25,6 @@ WebPage::WebPage(Translator &translator, const QString &script,
scheduleTranslatorScript(script, scriptName); scheduleTranslatorScript(script, scriptName);
settings()->setAttribute(QWebEngineSettings::AutoLoadImages, false); settings()->setAttribute(QWebEngineSettings::AutoLoadImages, false);
// settings()->setAttribute(QWebEngineSettings::LocalStorageEnabled, true);
auto channel = new QWebChannel(this); auto channel = new QWebChannel(this);
channel->registerObject("proxy", proxy_.get()); channel->registerObject("proxy", proxy_.get());