Start working on extensions tab in settings.

ModOrganizer2 · Jun 29, 2024 · 034da58 · 034da58
1 parent 9010b05
commit 034da58
Show file tree

Hide file tree

Showing 15 changed files with 551 additions and 356 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -239,7 +239,8 @@ mo2_add_filter(NAME src/settingsdialog GROUPS
 	settingsdialoggeneral
 	settingsdialognexus
 	settingsdialogpaths
-	settingsdialogplugins
+	settingsdialogextensions
+	settingsdialogextensionrow
 	settingsdialogworkarounds
 	settingsdialogmodlist
 	settingsdialogtheme

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -230,14 +230,15 @@ void setFilterShortcuts(QWidget* widget, QLineEdit* edit)
 }
 
 MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore,
-                       PluginManager& pluginManager, ThemeManager& themeManager,
+                       ExtensionManager& extensionManager, PluginManager& pluginManager,
+                       ThemeManager& themeManager,
                        TranslationManager& translationManager, QWidget* parent)
     : QMainWindow(parent), ui(new Ui::MainWindow), m_WasVisible(false),
       m_FirstPaint(true), m_linksSeparator(nullptr), m_Tutorial(this, "MainWindow"),
       m_OldProfileIndex(-1), m_OldExecutableIndex(-1),
       m_CategoryFactory(CategoryFactory::instance()), m_OrganizerCore(organizerCore),
-      m_PluginManager(pluginManager), m_ThemeManager(themeManager),
-      m_TranslationManager(translationManager),
+      m_ExtensionManager(extensionManager), m_PluginManager(pluginManager),
+      m_ThemeManager(themeManager), m_TranslationManager(translationManager),
       m_ArchiveListWriter(std::bind(&MainWindow::saveArchiveList, this)),
       m_LinkToolbar(nullptr), m_LinkDesktop(nullptr), m_LinkStartMenu(nullptr),
       m_NumberOfProblems(0), m_ProblemsCheckRequired(false)
@@ -2728,8 +2729,8 @@ void MainWindow::on_actionSettings_triggered()
   const bool oldCheckForUpdates = settings.checkForUpdates();
   const int oldMaxDumps         = settings.diagnostics().maxCoreDumps();
 
-  SettingsDialog dialog(m_PluginManager, m_ThemeManager, m_TranslationManager, settings,
-                        this);
+  SettingsDialog dialog(m_ExtensionManager, m_PluginManager, m_ThemeManager,
+                        m_TranslationManager, settings, this);
   dialog.exec();
 
   auto e = dialog.exitNeeded();

diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -23,8 +23,9 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "bsafolder.h"
 #include "delayedfilewriter.h"
 #include "errorcodes.h"
+#include "extensionmanager.h"
 #include "imoinfo.h"
-#include "iplugingame.h"  //namespace MOBase { class IPluginGame; }
+#include "iplugingame.h"
 #include "iuserinterface.h"
 #include "modinfo.h"
 #include "modlistbypriorityproxy.h"
@@ -127,7 +128,8 @@ class MainWindow : public QMainWindow, public IUserInterface
 
 public:
   explicit MainWindow(Settings& settings, OrganizerCore& organizerCore,
-                      PluginManager& pluginManager, ThemeManager& themeManager,
+                      ExtensionManager& extensionManager, PluginManager& pluginManager,
+                      ThemeManager& themeManager,
                       TranslationManager& translationManager, QWidget* parent = 0);
   ~MainWindow();
 
@@ -297,6 +299,7 @@ private slots:
   QTime m_StartTime;
 
   OrganizerCore& m_OrganizerCore;
+  ExtensionManager& m_ExtensionManager;
   PluginManager& m_PluginManager;
   ThemeManager& m_ThemeManager;
   TranslationManager& m_TranslationManager;

diff --git a/src/moapplication.cpp b/src/moapplication.cpp
@@ -294,7 +294,8 @@ int MOApplication::run(MOMultiProcess& multiProcess)
 
   {
     tt.start("MOApplication::doOneRun() MainWindow setup");
-    MainWindow mainWindow(*m_settings, *m_core, *m_plugins, *m_themes, *m_translations);
+    MainWindow mainWindow(*m_settings, *m_core, *m_extensions, *m_plugins, *m_themes,
+                          *m_translations);
 
     // the nexus interface can show dialogs, make sure they're parented to the
     // main window

diff --git a/src/pluginmanager.cpp b/src/pluginmanager.cpp
@@ -73,7 +73,7 @@ PluginDetails::PluginDetails(PluginManager* manager, PluginExtension const& exte
 
 void PluginDetails::fetchRequirements()
 {
-  m_requirements = m_plugin->requirements();
+  // m_requirements = m_plugin->requirements();
 }
 
 std::vector<IPluginRequirement::Problem> PluginDetails::problems() const

diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
@@ -19,23 +19,24 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "settingsdialog.h"
 #include "settingsdialogdiagnostics.h"
+#include "settingsdialogextensions.h"
 #include "settingsdialoggeneral.h"
 #include "settingsdialogmodlist.h"
 #include "settingsdialognexus.h"
 #include "settingsdialogpaths.h"
-#include "settingsdialogplugins.h"
 #include "settingsdialogtheme.h"
 #include "settingsdialogworkarounds.h"
 #include "ui_settingsdialog.h"
 
 using namespace MOBase;
 
-SettingsDialog::SettingsDialog(PluginManager& pluginManager,
+SettingsDialog::SettingsDialog(ExtensionManager& extensionManager,
+                               PluginManager& pluginManager,
                                ThemeManager const& themeManager,
                                TranslationManager const& translationManager,
                                Settings& settings, QWidget* parent)
     : TutorableDialog("SettingsDialog", parent), ui(new Ui::SettingsDialog),
-      m_settings(settings), m_exit(Exit::None), m_pluginManager(&pluginManager)
+      m_settings(settings), m_exit(Exit::None)
 {
   ui->setupUi(this);
 
@@ -50,7 +51,7 @@ SettingsDialog::SettingsDialog(PluginManager& pluginManager,
       std::unique_ptr<SettingsTab>(new DiagnosticsSettingsTab(settings, *this)));
   m_tabs.push_back(std::unique_ptr<SettingsTab>(new NexusSettingsTab(settings, *this)));
   m_tabs.push_back(std::unique_ptr<SettingsTab>(
-      new PluginsSettingsTab(settings, *m_pluginManager, *this)));
+      new ExtensionsSettingsTab(settings, extensionManager, pluginManager, *this)));
   m_tabs.push_back(
       std::unique_ptr<SettingsTab>(new WorkaroundsSettingsTab(settings, *this)));
 }

diff --git a/src/settingsdialog.h b/src/settingsdialog.h
@@ -24,6 +24,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "tutorabledialog.h"
 
 class PluginManager;
+class ExtensionManager;
 class Settings;
 class SettingsDialog;
 class ThemeManager;
@@ -66,7 +67,8 @@ class SettingsDialog : public MOBase::TutorableDialog
   friend class SettingsTab;
 
 public:
-  explicit SettingsDialog(PluginManager& pluginManager,
+  explicit SettingsDialog(ExtensionManager& extensionManager,
+                          PluginManager& pluginManager,
                           ThemeManager const& themeManager,
                           TranslationManager const& translationManager,
                           Settings& settings, QWidget* parent = 0);
@@ -94,7 +96,6 @@ public slots:
   Settings& m_settings;
   std::vector<std::unique_ptr<SettingsTab>> m_tabs;
   ExitFlags m_exit;
-  PluginManager* m_pluginManager;
 };
 
 #endif  // SETTINGSDIALOG_H
diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
@@ -1476,9 +1476,9 @@ If you disable this feature, MO will only display official DLCs this way. Please
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="pluginsTab">
+     <widget class="QWidget" name="extensionsTab">
       <attribute name="title">
-       <string>Plugins</string>
+       <string>Extensions</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_9">
        <item>
@@ -1532,13 +1532,7 @@ If you disable this feature, MO will only display official DLCs this way. Please
                 <number>0</number>
                </property>
                <item>
-                <widget class="QTreeWidget" name="pluginsList">
-                 <column>
-                  <property name="text">
-                   <string notr="true">1</string>
-                  </property>
-                 </column>
-                </widget>
+                <widget class="QListWidget" name="extensionsList"/>
                </item>
                <item>
                 <layout class="QHBoxLayout" name="horizontalLayout_4">

diff --git a/src/settingsdialogextensionrow.cpp b/src/settingsdialogextensionrow.cpp
@@ -0,0 +1,18 @@
+#include "settingsdialogextensionrow.h"
+
+#include "ui_settingsdialogextensionrow.h"
+
+using namespace MOBase;
+
+ExtensionListItemWidget::ExtensionListItemWidget(const IExtension& extension)
+    : ui{new Ui::ExtensionListItemWidget()}, m_extension{&extension}
+{
+  ui->setupUi(this);
+
+  QIcon icon = style()->standardIcon(QStyle::SP_DialogOkButton);
+  ui->extensionIcon->setPixmap(extension.metadata().icon().pixmap(QSize(48, 48)));
+  ui->extensionName->setText(extension.metadata().name());
+
+  ui->extensionDescription->setText(extension.metadata().description());
+  ui->extensionAuthor->setText(extension.metadata().author().name());
+}
diff --git a/src/settingsdialogextensionrow.h b/src/settingsdialogextensionrow.h
@@ -0,0 +1,23 @@
+#ifndef SETTINGSDIALOGEXTENSIONROW_H
+#define SETTINGSDIALOGEXTENSIONROW_H
+
+#include <QWidget>
+
+#include "extension.h"
+
+namespace Ui
+{
+class ExtensionListItemWidget;
+}
+
+class ExtensionListItemWidget : public QWidget
+{
+public:
+  ExtensionListItemWidget(MOBase::IExtension const& extension);
+
+private:
+  Ui::ExtensionListItemWidget* ui;
+  const MOBase::IExtension* m_extension;
+};
+
+#endif
diff --git a/src/settingsdialogextensionrow.ui b/src/settingsdialogextensionrow.ui
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ExtensionListItemWidget</class>
+ <widget class="QWidget" name="ExtensionListItemWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>250</width>
+    <height>60</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout_2">
+   <property name="leftMargin">
+    <number>2</number>
+   </property>
+   <property name="topMargin">
+    <number>2</number>
+   </property>
+   <property name="rightMargin">
+    <number>2</number>
+   </property>
+   <property name="bottomMargin">
+    <number>2</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="extensionIcon">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>48</width>
+       <height>48</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>45</width>
+       <height>48</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>TextLabel</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>5</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="spacing">
+      <number>2</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="extensionName">
+       <property name="font">
+        <font>
+         <pointsize>10</pointsize>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="extensionDescription">
+       <property name="font">
+        <font>
+         <pointsize>8</pointsize>
+         <italic>true</italic>
+        </font>
+       </property>
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="QLabel" name="extensionAuthor">
+         <property name="font">
+          <font>
+           <pointsize>8</pointsize>
+          </font>
+         </property>
+         <property name="text">
+          <string>TextLabel</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>