diff --git a/src/AnalTask.cpp b/src/AnalTask.cpp index 1ffc09c0..c52c58b5 100644 --- a/src/AnalTask.cpp +++ b/src/AnalTask.cpp @@ -23,7 +23,7 @@ void AnalTask::interrupt() void AnalTask::runTask() { - log(tr("Loading the file...\n")); + log(tr("Loading the file...")); openFailed = false; int perms = R_PERM_RX; @@ -64,7 +64,7 @@ void AnalTask::runTask() } if (!options.pdbFile.isNull()) { - log(tr("Loading PDB file...\n")); + log(tr("Loading PDB file...")); Core()->loadPDB(options.pdbFile); } @@ -73,7 +73,7 @@ void AnalTask::runTask() } if (!options.shellcode.isNull() && options.shellcode.size() / 2 > 0) { - log(tr("Loading shellcode...\n")); + log(tr("Loading shellcode...")); Core()->cmd("wx " + options.shellcode); } @@ -86,7 +86,7 @@ void AnalTask::runTask() Core()->cmd("fs *"); if (!options.script.isNull()) { - log(tr("Executing script...\n")); + log(tr("Executing script...")); Core()->loadScript(options.script); } @@ -98,16 +98,16 @@ void AnalTask::runTask() Core()->setConfig("prj.simple", true); if (!options.analCmd.empty()) { - log(tr("Analyzing...\n")); + log(tr("Analyzing...")); for (QString cmd : options.analCmd) { if (isInterrupted()) { return; } - log(" " + tr("Running") + " " + cmd + "\n"); + log(" " + tr("Running") + " " + cmd); Core()->cmd(cmd); } - log(tr("Analysis complete!\n")); + log(tr("Analysis complete!")); } else { - log(tr("Skipping Analysis.\n")); + log(tr("Skipping Analysis.")); } } diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 7744a2cb..897b2327 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -959,7 +959,7 @@ void MainWindow::on_actionExport_as_code_triggered() void MainWindow::projectSaved(const QString &name) { - core->message(tr("Project saved: ") + name); + core->message(tr("Project saved:") + " " + name); } void MainWindow::changeDebugView() diff --git a/src/common/AsyncTask.cpp b/src/common/AsyncTask.cpp index b2a52519..fc0b3429 100644 --- a/src/common/AsyncTask.cpp +++ b/src/common/AsyncTask.cpp @@ -60,7 +60,7 @@ void AsyncTask::run() void AsyncTask::log(QString s) { - logBuffer += s; + logBuffer += s + "\n"; emit logChanged(logBuffer); } diff --git a/src/dialogs/AboutDialog.cpp b/src/dialogs/AboutDialog.cpp index 72994d9d..a5390089 100644 --- a/src/dialogs/AboutDialog.cpp +++ b/src/dialogs/AboutDialog.cpp @@ -23,30 +23,30 @@ AboutDialog::AboutDialog(QWidget *parent) : setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint)); ui->logoSvgWidget->load(Config()->getLogoFile()); - ui->label->setText(tr("
Optional Features:
"
- "Jupyter: %1
"
- "QtWebEngine: %2
" + tr("Optional Features:") + "
"
+ + QString("Jupyter: %1
").arg(
#ifdef CUTTER_ENABLE_JUPYTER
- "ON"
+ "ON"
#else
- "OFF"
+ "OFF"
#endif
- ,
+ )
+ + QString("QtWebEngine: %2