1 files changed, 32 insertions, 29 deletions

diff --git a/src/ui/widgets/InfoBoardWidget.cpp b/src/ui/widgets/InfoBoardWidget.cpp
index 98b07089..fdec1e50 100644
--- a/src/ui/widgets/InfoBoardWidget.cpp
+++ b/src/ui/widgets/InfoBoardWidget.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2021 Saturneric
+ * Copyright (C) 2021 Saturneric <[email protected]>
  *
  * This file is part of GpgFrontend.
  *
@@ -20,7 +20,7 @@
  * the gpg4usb project, which is under GPL-3.0-or-later.
  *
  * All the source code of GpgFrontend was modified and released by
- * Saturneric<[email protected]> starting on May 12, 2021.
+ * Saturneric <[email protected]> starting on May 12, 2021.
  *
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
@@ -28,31 +28,34 @@
 
 #include "ui/widgets/InfoBoardWidget.h"
 
-#include "core/function/GlobalSettingStation.h"
-#include "ui/SignalStation.h"
+#include "core/GpgModel.h"
+#include "ui/UISignalStation.h"
 #include "ui/struct/SettingsObject.h"
+#include "ui/struct/settings/AppearanceSO.h"
 #include "ui_InfoBoard.h"
 
 namespace GpgFrontend::UI {
 
 InfoBoardWidget::InfoBoardWidget(QWidget* parent)
-    : QWidget(parent), ui_(std::make_shared<Ui_InfoBoard>()) {
+    : QWidget(parent),
+      ui_(GpgFrontend::SecureCreateSharedObject<Ui_InfoBoard>()) {
   ui_->setupUi(this);
 
   ui_->actionButtonLayout->addStretch();
-  ui_->copyButton->setText(_("Copy"));
-  ui_->saveButton->setText(_("Save File"));
-  ui_->clearButton->setText(_("Clear"));
+  ui_->copyToolButton->setToolTip(tr("Copy"));
+  ui_->saveToolButton->setToolTip(tr("Save File"));
+  ui_->clearToolButton->setToolTip(tr("Clear"));
 
-  connect(ui_->copyButton, &QPushButton::clicked, this,
+  connect(ui_->copyToolButton, &QToolButton::clicked, this,
           &InfoBoardWidget::slot_copy);
-  connect(ui_->saveButton, &QPushButton::clicked, this,
+  connect(ui_->saveToolButton, &QToolButton::clicked, this,
           &InfoBoardWidget::slot_save);
-  connect(ui_->clearButton, &QPushButton::clicked, this,
+  connect(ui_->clearToolButton, &QToolButton::clicked, this,
           &InfoBoardWidget::SlotReset);
 
-  connect(SignalStation::GetInstance(), &SignalStation::SignalRefreshInfoBoard,
-          this, &InfoBoardWidget::SlotRefresh);
+  connect(UISignalStation::GetInstance(),
+          &UISignalStation::SignalRefreshInfoBoard, this,
+          &InfoBoardWidget::SlotRefresh);
 }
 
 void InfoBoardWidget::SetInfoBoard(const QString& text,
@@ -79,12 +82,10 @@ void InfoBoardWidget::SetInfoBoard(const QString& text,
   status.setColor(QPalette::Text, color);
   ui_->infoBoard->setPalette(status);
 
-  SettingsObject general_settings_state("general_settings_state");
+  AppearanceSO appearance(SettingsObject("general_settings_state"));
 
   // info board font size
-  auto info_font_size =
-      general_settings_state.Check("text_editor").Check("font_size", 10);
-  ui_->infoBoard->setFont(QFont("Times", info_font_size));
+  ui_->infoBoard->setFont(QFont("Times", appearance.info_board_font_size));
 }
 
 void InfoBoardWidget::SlotRefresh(const QString& text, InfoBoardStatus status) {
@@ -94,9 +95,10 @@ void InfoBoardWidget::SlotRefresh(const QString& text, InfoBoardStatus status) {
 }
 
 void InfoBoardWidget::AssociateTextEdit(QTextEdit* edit) {
-  if (m_text_page_ != nullptr)
+  if (m_text_page_ != nullptr) {
     disconnect(m_text_page_, &QTextEdit::textChanged, this,
                &InfoBoardWidget::SlotReset);
+  }
   this->m_text_page_ = edit;
   connect(edit, &QTextEdit::textChanged, this, &InfoBoardWidget::SlotReset);
 }
@@ -113,15 +115,15 @@ void InfoBoardWidget::AssociateTabWidget(QTabWidget* tab) {
 
 void InfoBoardWidget::AddOptionalAction(const QString& name,
                                         const std::function<void()>& action) {
-  SPDLOG_DEBUG("add option: {}", name.toStdString());
-  auto actionButton = new QPushButton(name);
-  auto layout = new QHBoxLayout();
+  GF_UI_LOG_DEBUG("add option: {}", name.toStdString());
+  auto* action_button = new QPushButton(name);
+  auto* layout = new QHBoxLayout();
   layout->setContentsMargins(5, 0, 5, 0);
   ui_->infoBoard->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
   // set margin from surroundings
-  layout->addWidget(actionButton);
+  layout->addWidget(action_button);
   ui_->actionButtonLayout->addLayout(layout);
-  connect(actionButton, &QPushButton::clicked, this, [=]() { action(); });
+  connect(action_button, &QPushButton::clicked, this, [=]() { action(); });
 }
 
 /**
@@ -146,10 +148,11 @@ void InfoBoardWidget::delete_widgets_in_layout(QLayout* layout,
   QLayoutItem* item;
   while ((item = layout->layout()->takeAt(start_index)) != nullptr) {
     layout->removeItem(item);
-    if (item->layout() != nullptr)
+    if (item->layout() != nullptr) {
       delete_widgets_in_layout(item->layout());
-    else if (item->widget() != nullptr)
+    } else if (item->widget() != nullptr) {
       delete item->widget();
+    }
     delete item;
   }
 }
@@ -161,8 +164,8 @@ void InfoBoardWidget::slot_copy() {
 
 void InfoBoardWidget::slot_save() {
   auto file_path = QFileDialog::getSaveFileName(
-      this, _("Save Information Board's Content"), {}, tr("Text (*.txt)"));
-  SPDLOG_DEBUG("file path: {}", file_path.toStdString());
+      this, tr("Save Information Board's Content"), {}, tr("Text (*.txt)"));
+  GF_UI_LOG_DEBUG("file path: {}", file_path.toStdString());
   if (file_path.isEmpty()) return;
 
   QFile file(file_path);
@@ -170,8 +173,8 @@ void InfoBoardWidget::slot_save() {
     file.write(ui_->infoBoard->toPlainText().toUtf8());
   } else {
     QMessageBox::critical(
-        this, _("Error"),
-        _("The file path is not exists, unprivileged or unreachable."));
+        this, tr("Error"),
+        tr("The file path is not exists, unprivileged or unreachable."));
   }
   file.close();
 }