fix: use qt designer placeholder instead of custom initialized

8 files changed, 32 insertions, 18 deletions

diff --git a/src/core/module/ModuleManager.cpp b/src/core/module/ModuleManager.cpp
index 0e1f6984..6da48eec 100644
--- a/src/core/module/ModuleManager.cpp
+++ b/src/core/module/ModuleManager.cpp
@@ -203,7 +203,7 @@ class ModuleManager::Impl {
   QList<QLibrary> module_libraries_;
 };
 
-auto IsModuleAcivate(ModuleIdentifier id) -> bool {
+auto IsModuleActivate(ModuleIdentifier id) -> bool {
   return ModuleManager::GetInstance().IsModuleActivated(id);
 }
 
diff --git a/src/core/module/ModuleManager.h b/src/core/module/ModuleManager.h
index 5110dfc2..d5cd8387 100644
--- a/src/core/module/ModuleManager.h
+++ b/src/core/module/ModuleManager.h
@@ -130,7 +130,7 @@ void TriggerEvent(const EventIdentifier& event_id, Args&&... args,
  * @return true
  * @return false
  */
-auto GPGFRONTEND_CORE_EXPORT IsModuleAcivate(ModuleIdentifier) -> bool;
+auto GPGFRONTEND_CORE_EXPORT IsModuleActivate(ModuleIdentifier) -> bool;
 
 /**
  * @brief
diff --git a/src/ui/dialog/controller/ModuleControllerDialog.cpp b/src/ui/dialog/controller/ModuleControllerDialog.cpp
index ee23b80d..54fa9460 100644
--- a/src/ui/dialog/controller/ModuleControllerDialog.cpp
+++ b/src/ui/dialog/controller/ModuleControllerDialog.cpp
@@ -41,20 +41,14 @@ namespace GpgFrontend::UI {
 ModuleControllerDialog::ModuleControllerDialog(QWidget* parent)
     : QDialog(parent),
       ui_(std::make_shared<Ui_ModuleControllerDialog>()),
-      model_list_view_(new ModuleListView(this)),
       module_manager_(&Module::ModuleManager::GetInstance()) {
   ui_->setupUi(this);
 
-  model_list_view_->setFixedWidth(250);
-  model_list_view_->setViewMode(QListView::ListMode);
-  model_list_view_->setMovement(QListView::Static);
-
-  ui_->moduleListViewLayout->addWidget(model_list_view_);
-  connect(model_list_view_, &ModuleListView::SignalSelectModule, this,
+  connect(ui_->moduleListView, &ModuleListView::SignalSelectModule, this,
           &ModuleControllerDialog::slot_load_module_details);
 
   connect(ui_->activateOrDeactiveButton, &QPushButton::clicked, this, [=]() {
-    auto module_id = model_list_view_->GetCurrentModuleID();
+    auto module_id = ui_->moduleListView->GetCurrentModuleID();
     if (module_id.isEmpty()) return;
 
     if (!module_manager_->IsModuleActivated(module_id)) {
@@ -67,7 +61,7 @@ ModuleControllerDialog::ModuleControllerDialog(QWidget* parent)
   });
 
   connect(ui_->autoActivateButton, &QPushButton::clicked, this, [=]() {
-    auto module_id = model_list_view_->GetCurrentModuleID();
+    auto module_id = ui_->moduleListView->GetCurrentModuleID();
     SettingsObject so(QString("module.%1.so").arg(module_id));
     ModuleSO module_so(so);
 
diff --git a/src/ui/dialog/controller/ModuleControllerDialog.h b/src/ui/dialog/controller/ModuleControllerDialog.h
index 001e4614..6ded4808 100644
--- a/src/ui/dialog/controller/ModuleControllerDialog.h
+++ b/src/ui/dialog/controller/ModuleControllerDialog.h
@@ -55,7 +55,6 @@ class ModuleControllerDialog : public QDialog {
 
  private:
   std::shared_ptr<Ui_ModuleControllerDialog> ui_;  ///<
-  ModuleListView* model_list_view_;
   Module::ModuleManager* module_manager_;
 };
 
diff --git a/src/ui/dialog/help/AboutDialog.cpp b/src/ui/dialog/help/AboutDialog.cpp
index e3aa0a6c..260cd5a7 100644
--- a/src/ui/dialog/help/AboutDialog.cpp
+++ b/src/ui/dialog/help/AboutDialog.cpp
@@ -49,7 +49,7 @@ AboutDialog::AboutDialog(const QString& default_tab_name, QWidget* parent)
 
   tab_widget->addTab(info_tab, tr("About GpgFrontend"));
 
-  if (Module::IsModuleAcivate(
+  if (Module::IsModuleActivate(
           "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering")) {
     auto* gnupg_tab = new GnupgTab();
     tab_widget->addTab(gnupg_tab, tr("GnuPG"));
@@ -57,7 +57,7 @@ AboutDialog::AboutDialog(const QString& default_tab_name, QWidget* parent)
 
   tab_widget->addTab(translators_tab, tr("Translators"));
 
-  if (Module::IsModuleAcivate(kVersionCheckingModuleID)) {
+  if (Module::IsModuleActivate(kVersionCheckingModuleID)) {
     auto* update_tab = new UpdateTab();
     tab_widget->addTab(update_tab, tr("Update"));
   }
diff --git a/src/ui/dialog/help/GnupgTab.cpp b/src/ui/dialog/help/GnupgTab.cpp
index 218426b6..7722960d 100644
--- a/src/ui/dialog/help/GnupgTab.cpp
+++ b/src/ui/dialog/help/GnupgTab.cpp
@@ -302,7 +302,7 @@ void GnupgTab::process_software_info() {
 
 void GnupgTab::gather_gnupg_info() {
   // if gnupg_info_gathering module activated
-  if (Module::IsModuleAcivate(kGnuPGInfoGatheringModuleID)) {
+  if (Module::IsModuleActivate(kGnuPGInfoGatheringModuleID)) {
     GF_CORE_LOG_DEBUG(
         "module gnupg_info_gathering is activated, "
         "loading external gnupg info...");
diff --git a/src/ui/main_window/MainWindowUI.cpp b/src/ui/main_window/MainWindowUI.cpp
index c38684d7..0f8dfdb8 100644
--- a/src/ui/main_window/MainWindowUI.cpp
+++ b/src/ui/main_window/MainWindowUI.cpp
@@ -421,7 +421,7 @@ void MainWindow::create_actions() {
   connect(about_act_, &QAction::triggered, this,
           [=]() { new AboutDialog(0, this); });
 
-  if (Module::IsModuleAcivate(
+  if (Module::IsModuleActivate(
           "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering")) {
     gnupg_act_ = new QAction(tr("GnuPG"), this);
     gnupg_act_->setIcon(QIcon(":/icons/help.png"));
@@ -436,7 +436,7 @@ void MainWindow::create_actions() {
   connect(translate_act_, &QAction::triggered, this,
           [=]() { new AboutDialog(tr("Translators"), this); });
 
-  if (Module::IsModuleAcivate(
+  if (Module::IsModuleActivate(
           "com.bktus.gpgfrontend.module.integrated.version_checking")) {
     check_update_act_ = new QAction(tr("Check for Updates"), this);
     check_update_act_->setIcon(QIcon(":/icons/help.png"));
diff --git a/ui/ModuleControllerDialog.ui b/ui/ModuleControllerDialog.ui
index 8d4ea0d7..34945219 100644
--- a/ui/ModuleControllerDialog.ui
+++ b/ui/ModuleControllerDialog.ui
@@ -36,7 +36,21 @@
        <item>
         <layout class="QHBoxLayout" name="moduleControllerLayout">
          <item>
-          <layout class="QVBoxLayout" name="moduleListViewLayout"/>
+          <layout class="QVBoxLayout" name="moduleListViewLayout">
+           <property name="sizeConstraint">
+            <enum>QLayout::SetDefaultConstraint</enum>
+           </property>
+           <item>
+            <widget class="GpgFrontend::UI::ModuleListView" name="moduleListView">
+             <property name="maximumSize">
+              <size>
+               <width>250</width>
+               <height>16777215</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+          </layout>
          </item>
          <item>
           <widget class="Line" name="line_2">
@@ -169,6 +183,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>GpgFrontend::UI::ModuleListView</class>
+   <extends>QListView</extends>
+   <header>ui/widgets/ModuleListView.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>