diff --git a/src/manager.cpp b/src/manager.cpp index 9a45b30..a189cd9 100644 --- a/src/manager.cpp +++ b/src/manager.cpp @@ -1,6 +1,5 @@ #include "manager.h" #include "capturer.h" -#include "commonmodels.h" #include "corrector.h" #include "debug.h" #include "recognizer.h" @@ -12,7 +11,6 @@ #include "updates.h" #include -#include #include #include @@ -290,25 +288,6 @@ void Manager::copyLastToClipboard() representer_->clipboardLast(); } -void Manager::about() -{ - const auto mail = "translator@gres.biz"; - const auto issues = "https://github.com/OneMoreGres/ScreenTranslator/issues"; - const auto text = - QObject::tr( - R"(

Optical character recognition (OCR) and translation tool

-

Version: %1

-

Author: Gres (%2)

-

Issues: github

)") - .arg(QApplication::applicationVersion(), mail, issues); - - QMessageBox message(QMessageBox::Information, QObject::tr("About"), text, - QMessageBox::Ok); - message.setIconPixmap(QIcon(":/icons/app.png").pixmap(QSize(64, 64))); - message.setTextFormat(Qt::RichText); - message.exec(); -} - void Manager::quit() { QApplication::quit(); diff --git a/src/manager.h b/src/manager.h index cdb998d..f425796 100644 --- a/src/manager.h +++ b/src/manager.h @@ -25,7 +25,6 @@ public: void showTranslator(); void settings(); void copyLastToClipboard(); - void about(); void quit(); private: diff --git a/src/settingseditor.cpp b/src/settingseditor.cpp index ff847f0..3b9bcab 100644 --- a/src/settingseditor.cpp +++ b/src/settingseditor.cpp @@ -33,8 +33,8 @@ SettingsEditor::SettingsEditor(Manager &manager, update::Loader &updater) { auto model = new QStringListModel(this); model->setStringList({tr("General"), tr("Recognition"), tr("Correction"), - tr("Translation"), tr("Representation"), - tr("Update")}); + tr("Translation"), tr("Representation"), tr("Update"), + tr("About")}); ui->pagesList->setModel(model); auto selection = ui->pagesList->selectionModel(); connect(selection, &QItemSelectionModel::currentRowChanged, // @@ -103,6 +103,24 @@ SettingsEditor::SettingsEditor(Manager &manager, update::Loader &updater) connect(ui->applyUpdates, &QPushButton::clicked, // &updater_, &update::Loader::applyUserActions); + // about + { + const auto mail = "translator@gres.biz"; + const auto issues = + "https://github.com/OneMoreGres/ScreenTranslator/issues"; + const auto aboutText = + QObject::tr( + R"(

Optical character recognition (OCR) and translation tool

+

Version: %1

+

Author: Gres (%2)

+

Issues: %3

)") + .arg(QApplication::applicationVersion(), mail, issues); + + ui->aboutLabel->setText(aboutText); + ui->aboutLabel->setTextFormat(Qt::RichText); + ui->aboutLabel->setOpenExternalLinks(true); + } + new service::WidgetState(this); } diff --git a/src/settingseditor.ui b/src/settingseditor.ui index fe4414f..2ce73d5 100644 --- a/src/settingseditor.ui +++ b/src/settingseditor.ui @@ -632,6 +632,30 @@ + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + diff --git a/src/trayicon.cpp b/src/trayicon.cpp index d39c7dc..02f01c8 100644 --- a/src/trayicon.cpp +++ b/src/trayicon.cpp @@ -231,12 +231,6 @@ QMenu *TrayIcon::contextMenu() this, [this] { manager_.settings(); }); } - { - auto action = menu->addAction(tr("About")); - connect(action, &QAction::triggered, // - this, [this] { manager_.about(); }); - } - { auto action = menu->addAction(tr("Quit")); connect(action, &QAction::triggered, //