Begin work on adding SI extension to cfg tool

CONFIG/MainDlg.cpp

@@ -65,6 +65,7 @@ CMainDialog::CMainDialog(QWidget* pParent) : QDialog(pParent)
 	connect(m_ui->sound3DCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckbox3DSound);
 	connect(m_ui->rumbleCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckboxRumble);
 	connect(m_ui->textureCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckboxTexture);
+	connect(m_ui->customAssetsCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckboxCustomAssets);
 	connect(m_ui->touchComboBox, &QComboBox::currentIndexChanged, this, &CMainDialog::TouchControlsChanged);
 	connect(m_ui->transitionTypeComboBox, &QComboBox::currentIndexChanged, this, &CMainDialog::TransitionTypeChanged);
 	connect(m_ui->exFullResComboBox, &QComboBox::currentIndexChanged, this, &CMainDialog::ExclusiveResolutionChanged);
@@ -81,6 +82,11 @@ CMainDialog::CMainDialog(QWidget* pParent) : QDialog(pParent)
 	connect(m_ui->texturePathOpen, &QPushButton::clicked, this, &CMainDialog::SelectTexturePathDialog);
 	connect(m_ui->texturePath, &QLineEdit::editingFinished, this, &CMainDialog::TexturePathEdited);
 
+	connect(m_ui->addCustomAssetPath, &QPushButton::clicked, this, &CMainDialog::AddCustomAssetPath);
+	connect(m_ui->removeCustomAssetPath, &QPushButton::clicked, this, &CMainDialog::RemoveCustomAssetPath);
+	connect(m_ui->customAssetPaths, &QListWidget::currentRowChanged, this, &CMainDialog::SelectedPathChanged);
+	connect(m_ui->customAssetPaths, &QListWidget::itemActivated, this, &CMainDialog::EditCustomAssetPath);
+
 	connect(m_ui->maxLoDSlider, &QSlider::valueChanged, this, &CMainDialog::MaxLoDChanged);
 	connect(m_ui->maxLoDSlider, &QSlider::sliderMoved, this, &CMainDialog::MaxLoDChanged);
 	connect(m_ui->maxActorsSlider, &QSlider::valueChanged, this, &CMainDialog::MaxActorsChanged);
@@ -312,6 +318,16 @@ void CMainDialog::UpdateInterface()
 	m_ui->texturePath->setEnabled(currentConfigApp->m_texture_load);
 	m_ui->texturePathOpen->setEnabled(currentConfigApp->m_texture_load);
 
+	m_ui->customAssetsCheckBox->setChecked(currentConfigApp->m_custom_assets_enabled);
+	m_ui->customAssetPathContainer->setEnabled(currentConfigApp->m_custom_assets_enabled);
+	m_ui->customAssetPaths->setEnabled(currentConfigApp->m_custom_assets_enabled);
+	m_ui->addCustomAssetPath->setEnabled(currentConfigApp->m_custom_assets_enabled);
+	m_ui->removeCustomAssetPath->setEnabled(false);
+
+	m_ui->customAssetPaths->clear();
+	assetPaths = QString::fromStdString(currentConfigApp->m_custom_asset_path).split(u',');
+	m_ui->customAssetPaths->addItems(assetPaths);
+
 	m_ui->aspectRatioComboBox->setCurrentIndex(currentConfigApp->m_aspect_ratio);
 	m_ui->xResSpinBox->setValue(currentConfigApp->m_x_res);
 	m_ui->yResSpinBox->setValue(currentConfigApp->m_y_res);
@@ -442,6 +458,13 @@ void CMainDialog::OnCheckboxTexture(bool checked)
 	UpdateInterface();
 }
 
+void CMainDialog::OnCheckboxCustomAssets(bool checked)
+{
+	currentConfigApp->m_custom_assets_enabled = checked;
+	m_modified = true;
+	UpdateInterface();
+}
+
 void CMainDialog::TouchControlsChanged(int index)
 {
 	currentConfigApp->m_touch_scheme = index;
@@ -571,10 +594,10 @@ void CMainDialog::SelectTexturePathDialog()
 		QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks
 	);
 
-	QDir texture_dir = QDir(texture_path);
+	QDir data_path = QDir(QString::fromStdString(currentConfigApp->m_cd_path));
 
-	if (texture_dir.exists()) {
-		currentConfigApp->m_texture_path = texture_dir.absolutePath().toStdString();
+	if (data_path.exists(texture_path)) {
+		currentConfigApp->m_texture_path = data_path.relativeFilePath(texture_path).toStdString();
 		m_modified = true;
 	}
 	UpdateInterface();
@@ -582,15 +605,49 @@ void CMainDialog::SelectTexturePathDialog()
 
 void CMainDialog::TexturePathEdited()
 {
-	QDir texture_dir = QDir(m_ui->texturePath->text());
+	QString texture_path = m_ui->texturePath->text();
+	QDir data_path = QDir(QString::fromStdString(currentConfigApp->m_cd_path));
 
-	if (texture_dir.exists()) {
-		currentConfigApp->m_texture_path = texture_dir.absolutePath().toStdString();
+	if (data_path.exists(texture_path)) {
+		currentConfigApp->m_texture_path = data_path.relativeFilePath(texture_path).toStdString();
 		m_modified = true;
 	}
 	UpdateInterface();
 }
 
+void CMainDialog::AddCustomAssetPath()
+{
+	QDir data_path = QDir(QString::fromStdString(currentConfigApp->m_cd_path));
+	QStringList new_files = QFileDialog::getOpenFileNames(
+		this,
+		"Select one or more files to open",
+		data_path.absolutePath(),
+		"Interleaf files (*.si)"
+	);
+	UpdateAssetPaths();
+	UpdateInterface();
+}
+
+void CMainDialog::RemoveCustomAssetPath()
+{
+
+}
+
+void CMainDialog::SelectedPathChanged(int currentRow)
+{
+	m_ui->removeCustomAssetPath->setEnabled(currentRow != -1 ? true : false);
+}
+
+void CMainDialog::EditCustomAssetPath()
+{
+
+}
+
+void CMainDialog::UpdateAssetPaths()
+{
+
+}
+
 void CMainDialog::AspectRatioChanged(int index)
 {
 	currentConfigApp->m_aspect_ratio = index;

CONFIG/MainDlg.h

@@ -29,6 +29,7 @@ class CMainDialog : public QDialog {
 private:
 	bool m_modified = false;
 	bool m_advanced = false;
+	QStringList assetPaths = QStringList();
 	Ui::MainDialog* m_ui = nullptr;
 	SDL_DisplayMode** displayModes;
 
@@ -48,6 +49,7 @@ private slots:
 	void OnCheckboxMusic(bool checked);
 	void OnCheckboxRumble(bool checked);
 	void OnCheckboxTexture(bool checked);
+	void OnCheckboxCustomAssets(bool checked);
 	void TouchControlsChanged(int index);
 	void TransitionTypeChanged(int index);
 	void ExclusiveResolutionChanged(int index);
@@ -64,6 +66,11 @@ private slots:
 	void AFChanged(int value);
 	void SelectTexturePathDialog();
 	void TexturePathEdited();
+	void AddCustomAssetPath();
+	void RemoveCustomAssetPath();
+	void SelectedPathChanged(int currentRow);
+	void EditCustomAssetPath();
+	void UpdateAssetPaths();
 	void XResChanged(int i);
 	void YResChanged(int i);
 	void AspectRatioChanged(int index);

CONFIG/config.cpp

@@ -89,7 +89,9 @@ bool CConfigApp::InitInstance()
 	m_haptic = TRUE;
 	m_touch_scheme = 2;
 	m_texture_load = TRUE;
-	m_texture_path = "/textures/";
+	m_texture_path = "textures/";
+	m_custom_assets_enabled = TRUE;
+	m_custom_asset_path = "assets/widescreen.si";
 	int totalRamMiB = SDL_GetSystemRAM();
 	if (totalRamMiB < 12) {
 		m_ram_quality_limit = 2;
@@ -188,6 +190,8 @@ bool CConfigApp::ReadRegisterSettings()
 	m_anisotropy = iniparser_getint(dict, "isle:Anisotropic", m_anisotropy);
 	m_texture_load = iniparser_getboolean(dict, "extensions:texture loader", m_texture_load);
 	m_texture_path = iniparser_getstring(dict, "texture loader:texture path", m_texture_path.c_str());
+	m_custom_assets_enabled = iniparser_getboolean(dict, "extensions:si loader", m_custom_assets_enabled);
+	m_custom_asset_path = iniparser_getstring(dict, "si loader:files", m_custom_asset_path.c_str());
 	m_aspect_ratio = iniparser_getint(dict, "isle:Aspect Ratio", m_aspect_ratio);
 	m_x_res = iniparser_getint(dict, "isle:Horizontal Resolution", m_x_res);
 	m_y_res = iniparser_getint(dict, "isle:Vertical Resolution", m_y_res);
@@ -394,6 +398,9 @@ void CConfigApp::WriteRegisterSettings() const
 	SetIniBool(dict, "extensions:texture loader", m_texture_load);
 	iniparser_set(dict, "texture loader:texture path", m_texture_path.c_str());
 
+	SetIniBool(dict, "extensions:si loader", m_custom_assets_enabled);
+	iniparser_set(dict, "si loader:files", m_custom_asset_path.c_str());
+
 	SetIniBool(dict, "isle:Back Buffers in Video RAM", m_3d_video_ram);
 
 	SetIniInt(dict, "isle:Island Quality", m_model_quality);

CONFIG/config.h

@@ -87,7 +87,9 @@ class CConfigApp {
 	int m_texture_quality;
 	bool m_music;
 	bool m_texture_load;
+	bool m_custom_assets_enabled;
 	std::string m_texture_path;
+	std::string m_custom_asset_path;
 	std::string m_iniPath;
 	std::string m_base_path;
 	std::string m_cd_path;

CONFIG/res/maindialog.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>600</width>
+    <width>640</width>
     <height>480</height>
    </rect>
   </property>
@@ -1012,72 +1012,197 @@ The game will gradually increase the number of actors until this maximum is reac
          </attribute>
          <layout class="QVBoxLayout" name="verticalLayout_8">
           <item>
-           <widget class="QGroupBox" name="textureLoader">
-            <property name="toolTip">
-             <string>Settings for Texture Loader extension.</string>
+           <widget class="QScrollArea" name="scrollArea">
+            <property name="widgetResizable">
+             <bool>true</bool>
             </property>
-            <property name="title">
-             <string>Texture Loader</string>
-            </property>
-            <layout class="QHBoxLayout" name="horizontalLayout_2">
-             <item>
-              <widget class="QCheckBox" name="textureCheckBox">
-               <property name="text">
-                <string>Enabled</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLineEdit" name="texturePath">
-               <property name="enabled">
-                <bool>false</bool>
-               </property>
-               <property name="toolTip">
-                <string>Path to texture replacements.</string>
-               </property>
-               <property name="placeholderText">
-                <string>textures/</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QPushButton" name="texturePathOpen">
-               <property name="enabled">
-                <bool>false</bool>
-               </property>
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>50</width>
-                 <height>16777215</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>Open</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
+            <widget class="QWidget" name="scrollAreaWidgetContents">
+             <property name="geometry">
+              <rect>
+               <x>0</x>
+               <y>0</y>
+               <width>449</width>
+               <height>369</height>
+              </rect>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_10">
+              <property name="leftMargin">
+               <number>0</number>
+              </property>
+              <property name="topMargin">
+               <number>0</number>
+              </property>
+              <property name="rightMargin">
+               <number>0</number>
+              </property>
+              <property name="bottomMargin">
+               <number>0</number>
+              </property>
+              <item>
+               <widget class="QGroupBox" name="textureLoader">
+                <property name="toolTip">
+                 <string>Settings for Texture Loader extension.</string>
+                </property>
+                <property name="title">
+                 <string>Texture Loader</string>
+                </property>
+                <layout class="QHBoxLayout" name="horizontalLayout_2">
+                 <item>
+                  <widget class="QCheckBox" name="textureCheckBox">
+                   <property name="text">
+                    <string>Enabled</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLineEdit" name="texturePath">
+                   <property name="enabled">
+                    <bool>false</bool>
+                   </property>
+                   <property name="toolTip">
+                    <string>Path to texture replacements. Relative to the Data Path.</string>
+                   </property>
+                   <property name="placeholderText">
+                    <string>textures/</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QPushButton" name="texturePathOpen">
+                   <property name="enabled">
+                    <bool>false</bool>
+                   </property>
+                   <property name="sizePolicy">
+                    <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
+                   <property name="maximumSize">
+                    <size>
+                     <width>50</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="text">
+                    <string>Open</string>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <widget class="QGroupBox" name="customAssets">
+                <property name="toolTip">
+                 <string>Settings for Custom Assets.</string>
+                </property>
+                <property name="title">
+                 <string>Custom Assets</string>
+                </property>
+                <layout class="QHBoxLayout" name="horizontalLayout_12">
+                 <item>
+                  <widget class="QCheckBox" name="customAssetsCheckBox">
+                   <property name="text">
+                    <string>Enabled</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QWidget" name="customAssetPathContainer" native="true">
+                   <property name="enabled">
+                    <bool>false</bool>
+                   </property>
+                   <layout class="QGridLayout" name="gridLayout_3">
+                    <property name="leftMargin">
+                     <number>0</number>
+                    </property>
+                    <property name="topMargin">
+                     <number>0</number>
+                    </property>
+                    <property name="rightMargin">
+                     <number>0</number>
+                    </property>
+                    <property name="bottomMargin">
+                     <number>0</number>
+                    </property>
+                    <item row="0" column="1">
+                     <widget class="QPushButton" name="addCustomAssetPath">
+                      <property name="enabled">
+                       <bool>false</bool>
+                      </property>
+                      <property name="maximumSize">
+                       <size>
+                        <width>30</width>
+                        <height>30</height>
+                       </size>
+                      </property>
+                      <property name="toolTip">
+                       <string>Add path.</string>
+                      </property>
+                      <property name="icon">
+                       <iconset theme="QIcon::ThemeIcon::ListAdd"/>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="0" column="0" rowspan="3">
+                     <widget class="QListWidget" name="customAssetPaths">
+                      <property name="enabled">
+                       <bool>false</bool>
+                      </property>
+                      <property name="sizeAdjustPolicy">
+                       <enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustToContentsOnFirstShow</enum>
+                      </property>
+                      <property name="dragEnabled">
+                       <bool>true</bool>
+                      </property>
+                      <property name="dragDropMode">
+                       <enum>QAbstractItemView::DragDropMode::InternalMove</enum>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="1" column="1">
+                     <widget class="QPushButton" name="removeCustomAssetPath">
+                      <property name="enabled">
+                       <bool>false</bool>
+                      </property>
+                      <property name="maximumSize">
+                       <size>
+                        <width>30</width>
+                        <height>30</height>
+                       </size>
+                      </property>
+                      <property name="toolTip">
+                       <string>Remove path.</string>
+                      </property>
+                      <property name="icon">
+                       <iconset theme="QIcon::ThemeIcon::ListRemove"/>
+                      </property>
+                     </widget>
+                    </item>
+                   </layout>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <spacer name="verticalSpacer_3">
+                <property name="orientation">
+                 <enum>Qt::Orientation::Vertical</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>20</width>
+                  <height>40</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </widget>
            </widget>
           </item>
-          <item>
-           <spacer name="verticalSpacer_3">
-            <property name="orientation">
-             <enum>Qt::Orientation::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>40</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
          </layout>
         </widget>
        </widget>
@@ -1176,9 +1301,14 @@ The game will gradually increase the number of actors until this maximum is reac
   <tabstop>AFSlider</tabstop>
   <tabstop>touchComboBox</tabstop>
   <tabstop>rumbleCheckBox</tabstop>
+  <tabstop>scrollArea</tabstop>
   <tabstop>textureCheckBox</tabstop>
   <tabstop>texturePath</tabstop>
   <tabstop>texturePathOpen</tabstop>
+  <tabstop>customAssetsCheckBox</tabstop>
+  <tabstop>customAssetPaths</tabstop>
+  <tabstop>addCustomAssetPath</tabstop>
+  <tabstop>removeCustomAssetPath</tabstop>
   <tabstop>okButton</tabstop>
   <tabstop>launchButton</tabstop>
   <tabstop>cancelButton</tabstop>