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

capturing this by ref is dumb

Browse Source
This commit is contained in:
Akash Mozumdar 2018-12-18 12:55:11 -05:00
parent b82d8d5523
commit 3c67f5a15d
4 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GUI/extenwindow.cpp
View File

@ -83,8 +83,8 @@ ExtenWindow::ExtenWindow(QWidget* parent) :
ui->extenList->installEventFilter(this); ui->extenList->installEventFilter(this);
connect(ui->addButton, &QPushButton::clicked, [&] { Add(QFileDialog::getOpenFileName(this, SELECT_EXTENSION, "C:\\", EXTENSION_FILES)); }); connect(ui->addButton, &QPushButton::clicked, [this] { Add(QFileDialog::getOpenFileName(this, SELECT_EXTENSION, "C:\\", EXTENSION_FILES)); });
connect(ui->rmvButton, &QPushButton::clicked, [&] { if (auto extenName = ui->extenList->currentItem()) Unload(extenName->text()); Sync(); }); connect(ui->rmvButton, &QPushButton::clicked, [this] { if (auto extenName = ui->extenList->currentItem()) Unload(extenName->text()); Sync(); });
for (auto extenName : QString(QAutoFile(EXTEN_SAVE_FILE, QIODevice::ReadOnly)->readAll()).split(">")) Load(extenName); for (auto extenName : QString(QAutoFile(EXTEN_SAVE_FILE, QIODevice::ReadOnly)->readAll()).split(">")) Load(extenName);
Sync(); Sync();

26
GUI/mainwindow.cpp
View File

@ -43,11 +43,11 @@ MainWindow::MainWindow(QWidget *parent) :
settings.sync(); settings.sync();
Host::Start( Host::Start(
[&](DWORD processId) { ProcessConnected(processId); }, [this](DWORD processId) { ProcessConnected(processId); },
[&](DWORD processId) { ProcessDisconnected(processId); }, [this](DWORD processId) { ProcessDisconnected(processId); },
[&](TextThread* thread) { ThreadAdded(thread); }, [this](TextThread* thread) { ThreadAdded(thread); },
[&](TextThread* thread) { ThreadRemoved(thread); }, [this](TextThread* thread) { ThreadRemoved(thread); },
[&](TextThread* thread, std::wstring& output) { return SentenceReceived(thread, output); } [this](TextThread* thread, std::wstring& output) { return SentenceReceived(thread, output); }
); );
Host::AddConsoleOutput(ABOUT); Host::AddConsoleOutput(ABOUT);
@ -83,16 +83,10 @@ void MainWindow::closeEvent(QCloseEvent*)
QCoreApplication::quit(); // Need to do this to kill any windows that might've been made by extensions QCoreApplication::quit(); // Need to do this to kill any windows that might've been made by extensions
} }
void MainWindow::InvokeOnMainThread(std::function<void()> f)
{
QMetaObject::invokeMethod(this, f);
}
void MainWindow::ProcessConnected(DWORD processId) void MainWindow::ProcessConnected(DWORD processId)
{ {
if (processId == 0) return; if (processId == 0) return;
InvokeOnMainThread([&, processId] QMetaObject::invokeMethod(this, [this, processId]
{ {
QString process = S(Util::GetModuleFileName(processId).value()); QString process = S(Util::GetModuleFileName(processId).value());
ui->processCombo->addItem(QString::number(processId, 16).toUpper() + ": " + QFileInfo(process).fileName()); ui->processCombo->addItem(QString::number(processId, 16).toUpper() + ": " + QFileInfo(process).fileName());
@ -108,19 +102,19 @@ void MainWindow::ProcessConnected(DWORD processId)
void MainWindow::ProcessDisconnected(DWORD processId) void MainWindow::ProcessDisconnected(DWORD processId)
{ {
InvokeOnMainThread([&, processId] { ui->processCombo->removeItem(ui->processCombo->findText(QString::number(processId, 16).toUpper() + ":", Qt::MatchStartsWith)); }); QMetaObject::invokeMethod(this, [this, processId] { ui->processCombo->removeItem(ui->processCombo->findText(QString::number(processId, 16).toUpper() + ":", Qt::MatchStartsWith)); });
} }
void MainWindow::ThreadAdded(TextThread* thread) void MainWindow::ThreadAdded(TextThread* thread)
{ {
QString ttString = TextThreadString(thread) + S(thread->name) + " (" + GenerateCode(thread->hp, thread->tp.processId) + ")"; QString ttString = TextThreadString(thread) + S(thread->name) + " (" + GenerateCode(thread->hp, thread->tp.processId) + ")";
InvokeOnMainThread([&, ttString] { ui->ttCombo->addItem(ttString); }); QMetaObject::invokeMethod(this, [this, ttString] { ui->ttCombo->addItem(ttString); });
} }
void MainWindow::ThreadRemoved(TextThread* thread) void MainWindow::ThreadRemoved(TextThread* thread)
{ {
QString ttString = TextThreadString(thread); QString ttString = TextThreadString(thread);
InvokeOnMainThread([&, ttString] QMetaObject::invokeMethod(this, [this, ttString]
{ {
int threadIndex = ui->ttCombo->findText(ttString, Qt::MatchStartsWith); int threadIndex = ui->ttCombo->findText(ttString, Qt::MatchStartsWith);
if (threadIndex == ui->ttCombo->currentIndex()) if (threadIndex == ui->ttCombo->currentIndex())
@ -138,7 +132,7 @@ bool MainWindow::SentenceReceived(TextThread* thread, std::wstring& sentence)
{ {
sentence += L"\r\n"; sentence += L"\r\n";
QString ttString = TextThreadString(thread); QString ttString = TextThreadString(thread);
InvokeOnMainThread([&, ttString, sentence] QMetaObject::invokeMethod(this, [this, ttString, sentence]
{ {
if (ui->ttCombo->currentText().startsWith(ttString)) if (ui->ttCombo->currentText().startsWith(ttString))
{ {

1
GUI/mainwindow.h
View File

@ -17,7 +17,6 @@ public:
private: private:
void closeEvent(QCloseEvent*) override; void closeEvent(QCloseEvent*) override;
void InvokeOnMainThread(std::function<void()> f);
void ProcessConnected(DWORD processId); void ProcessConnected(DWORD processId);
void ProcessDisconnected(DWORD processId); void ProcessDisconnected(DWORD processId);
void ThreadAdded(TextThread* thread); void ThreadAdded(TextThread* thread);

2
GUI/setdialog.cpp
View File

@ -21,7 +21,7 @@ SetDialog::SetDialog(QWidget* parent) :
ui->layout->insertRow(0, label, spinBox); ui->layout->insertRow(0, label, spinBox);
} }
connect(ui->buttonBox, &QDialogButtonBox::accepted, [&] { edited = true; }); connect(ui->buttonBox, &QDialogButtonBox::accepted, [this] { edited = true; });
} }
SetDialog::~SetDialog() SetDialog::~SetDialog()