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("

Cutter

" - "Version " CUTTER_VERSION_FULL "
" - "Using r2-" R2_GITTAP - "

Optional Features:
" - "Jupyter: %1
" - "QtWebEngine: %2

" - "

License

" - "This Software is released under the GNU General Public License v3.0" - "

Authors

" - "xarkes, thestr4ng3r, ballessay
" - "Based on work by Hugo Teso <hugo.teso@gmail.org> (originally Iaito).") - .arg( + QString aboutString("

Cutter

" + + tr("Version") + " " CUTTER_VERSION_FULL "
" + + tr("Using r2-") + R2_GITTAP + + "

" + tr("Optional Features:") + "
" + + QString("Jupyter: %1
").arg( #ifdef CUTTER_ENABLE_JUPYTER - "ON" + "ON" #else - "OFF" + "OFF" #endif - , + ) + + QString("QtWebEngine: %2

").arg( #ifdef CUTTER_ENABLE_QTWEBENGINE - "ON" + "ON" #else - "OFF" + "OFF" #endif - )); + ) + + "

" + tr("License") + "

" + + tr("This Software is released under the GNU General Public License v3.0") + + "

" + tr("Authors") + "

" + "xarkes, thestr4ng3r, ballessay
" + "Based on work by Hugo Teso <hugo.teso@gmail.org> (originally Iaito)."); + ui->label->setText(aboutString); } AboutDialog::~AboutDialog() {} @@ -129,10 +129,10 @@ void AboutDialog::serveVersionCheckReply(QNetworkReply *reply) if (currVersion == CUTTER_VERSION_FULL) { mb.setText(tr("You have latest version and no need to update!")); } else { - mb.setText(tr("Current version: " CUTTER_VERSION_FULL "
" - "Latest version: %1

" - "For update, please check the link: %2") - .arg(currVersion, "https://github.com/radareorg/cutter/releases")); + mb.setText("" + tr("Current version:") + "" CUTTER_VERSION_FULL "
" + + "" + tr("Latest version:") + " " + currVersion + "

" + + tr("For update, please check the link:") + + "%2"); } } mb.exec(); diff --git a/src/widgets/VTablesWidget.cpp b/src/widgets/VTablesWidget.cpp index 8ca33f06..66e85bca 100644 --- a/src/widgets/VTablesWidget.cpp +++ b/src/widgets/VTablesWidget.cpp @@ -59,7 +59,7 @@ QVariant VTableModel::data(const QModelIndex &index, int role) const case Qt::DisplayRole: switch (index.column()) { case NAME: - return tr("VTable ") + QString::number(index.row() + 1); + return tr("VTable") + " " + QString::number(index.row() + 1); case ADDRESS: return RAddressString(vtables->at(index.row()).addr); } @@ -86,6 +86,7 @@ QVariant VTableModel::headerData(int section, Qt::Orientation, int role) const default: break; } + break; default: break; }