Cleanup
This commit is contained in:
		
							parent
							
								
									ad107834eb
								
							
						
					
					
						commit
						4d6f5857c0
					
				@ -1,14 +1,10 @@
 | 
			
		||||
#include "settingseditor.h"
 | 
			
		||||
#include "languagecodes.h"
 | 
			
		||||
#include "settings.h"
 | 
			
		||||
#include "ui_settingseditor.h"
 | 
			
		||||
#include "widgetstate.h"
 | 
			
		||||
 | 
			
		||||
#include <QDir>
 | 
			
		||||
#include <QFileDialog>
 | 
			
		||||
#include <QNetworkProxy>
 | 
			
		||||
#include <QRegExpValidator>
 | 
			
		||||
#include <QSettings>
 | 
			
		||||
#include <QStringListModel>
 | 
			
		||||
 | 
			
		||||
SettingsEditor::SettingsEditor()
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										12
									
								
								src/task.h
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								src/task.h
									
									
									
									
									
								
							@ -9,22 +9,18 @@ class Task
 | 
			
		||||
public:
 | 
			
		||||
  bool isNull() const { return captured.isNull() && !sourceLanguage.isEmpty(); }
 | 
			
		||||
  bool isValid() const { return error.isEmpty(); }
 | 
			
		||||
  //  void trace(const QString& message);
 | 
			
		||||
 | 
			
		||||
  QPoint capturePoint;
 | 
			
		||||
  QPixmap captured;
 | 
			
		||||
  QString recognized;
 | 
			
		||||
  QString translated{"sample"};
 | 
			
		||||
  QString translated;
 | 
			
		||||
 | 
			
		||||
  LanguageId sourceLanguage{"eng"};
 | 
			
		||||
  LanguageId targetLanguage;  //{"ru"};
 | 
			
		||||
  LanguageId sourceLanguage;
 | 
			
		||||
  LanguageId targetLanguage;
 | 
			
		||||
 | 
			
		||||
  QStringList translators{"google.js"};
 | 
			
		||||
  QStringList translators;
 | 
			
		||||
 | 
			
		||||
  QString error;
 | 
			
		||||
  //  QStringList traceLog;
 | 
			
		||||
 | 
			
		||||
  //  bool swapLanguages;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
using TaskPtr = std::shared_ptr<Task>;
 | 
			
		||||
 | 
			
		||||
@ -4,18 +4,13 @@
 | 
			
		||||
#include "settings.h"
 | 
			
		||||
#include "task.h"
 | 
			
		||||
#include "webpage.h"
 | 
			
		||||
#include "webpageproxy.h"
 | 
			
		||||
#include "widgetstate.h"
 | 
			
		||||
 | 
			
		||||
#include <QBoxLayout>
 | 
			
		||||
#include <QCloseEvent>
 | 
			
		||||
#include <QFile>
 | 
			
		||||
#include <QSplitter>
 | 
			
		||||
#include <QTabWidget>
 | 
			
		||||
#include <QTcpSocket>
 | 
			
		||||
#include <QTextEdit>
 | 
			
		||||
#include <QWebChannel>
 | 
			
		||||
#include <QWebEngineView>
 | 
			
		||||
 | 
			
		||||
#include <unordered_set>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -25,7 +25,6 @@ WebPage::WebPage(Translator &translator, const QString &script,
 | 
			
		||||
  scheduleTranslatorScript(script, scriptName);
 | 
			
		||||
 | 
			
		||||
  settings()->setAttribute(QWebEngineSettings::AutoLoadImages, false);
 | 
			
		||||
  //  settings()->setAttribute(QWebEngineSettings::LocalStorageEnabled, true);
 | 
			
		||||
 | 
			
		||||
  auto channel = new QWebChannel(this);
 | 
			
		||||
  channel->registerObject("proxy", proxy_.get());
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user