chenx221/Textractor_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into pr/757-devtools-deepl-translate-sometimes-the-target-language-is-wrong

Browse Source
This commit is contained in:
Akash Mozumdar 2022-07-27 00:34:27 -04:00
commit df53e31119
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.appveyor.yml
View File

@ -5,21 +5,21 @@ skip_branch_with_pr: false
environment: environment:
matrix: matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
arch: x64 arch: x64
platform: x64 platform: x64
qtbin: msvc2019_64 qtbin: msvc2017_64
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
arch: x86 arch: x86
platform: Win32 platform: Win32
qtbin: msvc2019 qtbin: msvc2017
before_build: before_build:
- git submodule update --init - git submodule update --init
- cd C:\ - cd C:\
- mkdir %arch% - mkdir %arch%
- cd %arch% - cd %arch%
- cmake -G "Visual Studio 16 2019" -A "%platform%" -DQt5_DIR="C:\Qt\5.15\%qtbin%\lib\cmake\Qt5" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DVERSION="" ../Textractor - cmake -G "Visual Studio 15 2017" -A %platform% -DQt5_DIR="C:\Qt\5.13.2\%qtbin%\lib\cmake\Qt5" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DVERSION="" ../Textractor
build: build:
project: C:\%arch%\Textractor.sln project: C:\%arch%\Textractor.sln

2
extensions/blockmarkup.h
View File

@ -49,7 +49,7 @@ private:
} }
static constexpr C endImpl[5] = { '|', 'E', 'N', 'D', '|' }; static constexpr C endImpl[5] = { '|', 'E', 'N', 'D', '|' };
static constexpr std::basic_string_view end{ endImpl, 5 }; static constexpr std::basic_string_view<C> end{ endImpl, 5 };
std::basic_streambuf<char>& streambuf; std::basic_streambuf<char>& streambuf;
std::basic_string<C> buffer; std::basic_string<C> buffer;

4
extensions/devtools.cpp
View File

@ -36,11 +36,11 @@ namespace
if (process) DevTools::Close(); if (process) DevTools::Close();
auto args = FormatString( auto args = FormatString(
L"%s --proxy-server=direct:// --disable-extensions --disable-gpu --user-data-dir=%s\\devtoolscache --remote-debugging-port=9222", L"%s --proxy-server=direct:// --disable-extensions --disable-gpu --no-first-run --user-data-dir=\"%s\\devtoolscache\" --remote-debugging-port=9222",
chromePath, chromePath,
std::filesystem::current_path().wstring() std::filesystem::current_path().wstring()
); );
if (headless) args += L" --headless"; args += headless ? L" --window-size=1920,1080 --headless" : L" --window-size=850,900";
DWORD exitCode = 0; DWORD exitCode = 0;
STARTUPINFOW DUMMY = { sizeof(DUMMY) }; STARTUPINFOW DUMMY = { sizeof(DUMMY) };
PROCESS_INFORMATION processInfo = {}; PROCESS_INFORMATION processInfo = {};

1
extensions/regexreplacer.cpp
View File

@ -2,6 +2,7 @@
#include "module.h" #include "module.h"
#include "blockmarkup.h" #include "blockmarkup.h"
#include <fstream> #include <fstream>
#include <process.h>
extern const wchar_t* REGEX_REPLACER_INSTRUCTIONS; extern const wchar_t* REGEX_REPLACER_INSTRUCTIONS;