Added changing the transition type to the config tool (#511)

CONFIG/MainDlg.cpp

@@ -59,6 +59,7 @@ CMainDialog::CMainDialog(QWidget* pParent) : QDialog(pParent)
 	connect(m_ui->sound3DCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckbox3DSound);
 	connect(m_ui->joystickCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckboxJoystick);
 	connect(m_ui->fullscreenCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckboxFullscreen);
+	connect(m_ui->transitionTypeComboBox, &QComboBox::currentIndexChanged, this, &CMainDialog::TransitionTypeChanged);
 	connect(m_ui->okButton, &QPushButton::clicked, this, &CMainDialog::accept);
 	connect(m_ui->cancelButton, &QPushButton::clicked, this, &CMainDialog::reject);
 	connect(m_ui->launchButton, &QPushButton::clicked, this, &CMainDialog::launch);
@@ -212,6 +213,7 @@ void CMainDialog::UpdateInterface()
 	m_ui->joystickCheckBox->setChecked(currentConfigApp->m_use_joystick);
 	m_ui->musicCheckBox->setChecked(currentConfigApp->m_music);
 	m_ui->fullscreenCheckBox->setChecked(currentConfigApp->m_full_screen);
+	m_ui->transitionTypeComboBox->setCurrentIndex(currentConfigApp->m_transition_type);
 	m_ui->dataPath->setText(QString::fromStdString(currentConfigApp->m_cd_path));
 	m_ui->savePath->setText(QString::fromStdString(currentConfigApp->m_save_path));
 }
@@ -296,6 +298,13 @@ void CMainDialog::OnCheckboxFullscreen(bool checked)
 	UpdateInterface();
 }
 
+void CMainDialog::TransitionTypeChanged(int index)
+{
+	currentConfigApp->m_transition_type = index;
+	m_modified = true;
+	UpdateInterface();
+}
+
 void CMainDialog::SelectDataPathDialog()
 {
 	QString data_path = QString::fromStdString(currentConfigApp->m_cd_path);

CONFIG/MainDlg.h

@@ -43,6 +43,7 @@ private slots:
 	void OnCheckboxJoystick(bool checked);
 	void OnCheckboxMusic(bool checked);
 	void OnCheckboxFullscreen(bool checked);
+	void TransitionTypeChanged(int index);
 	void accept() override;
 	void reject() override;
 	void launch();

CONFIG/config.cpp

@@ -70,6 +70,7 @@ bool CConfigApp::InitInstance()
 	m_driver = NULL;
 	m_device = NULL;
 	m_full_screen = TRUE;
+	m_transition_type = 3; // 3: Mosaic
 	m_wide_view_angle = TRUE;
 	m_use_joystick = TRUE;
 	m_music = TRUE;
@@ -153,6 +154,7 @@ bool CConfigApp::ReadRegisterSettings()
 	m_display_bit_depth = iniparser_getint(dict, "isle:Display Bit Depth", -1);
 	m_flip_surfaces = iniparser_getboolean(dict, "isle:Flip Surfaces", m_flip_surfaces);
 	m_full_screen = iniparser_getboolean(dict, "isle:Full Screen", m_full_screen);
+	m_transition_type = iniparser_getint(dict, "isle:Transition Type", m_transition_type);
 	m_3d_video_ram = iniparser_getboolean(dict, "isle:Back Buffers in Video RAM", m_3d_video_ram);
 	m_wide_view_angle = iniparser_getboolean(dict, "isle:Wide View Angle", m_wide_view_angle);
 	m_3d_sound = iniparser_getboolean(dict, "isle:3DSound", m_3d_sound);
@@ -308,6 +310,8 @@ void CConfigApp::WriteRegisterSettings() const
 	SetIniBool(dict, "isle:Full Screen", m_full_screen);
 	SetIniBool(dict, "isle:Wide View Angle", m_wide_view_angle);
 
+	SetIniInt(dict, "isle:Transition Type", m_transition_type);
+
 	SetIniBool(dict, "isle:3DSound", m_3d_sound);
 	SetIniBool(dict, "isle:Music", m_music);
 

CONFIG/config.h

@@ -65,6 +65,7 @@ public:
 	int m_display_bit_depth;
 	bool m_flip_surfaces;
 	bool m_full_screen;
+	int m_transition_type;
 	bool m_3d_video_ram;
 	bool m_wide_view_angle;
 	bool m_3d_sound;

CONFIG/res/maindialog.ui

@@ -57,7 +57,7 @@
       <bool>false</bool>
      </property>
      <property name="alignment">
-      <set>Qt::AlignCenter</set>
+      <set>Qt::AlignmentFlag::AlignCenter</set>
      </property>
     </widget>
    </item>
@@ -129,10 +129,10 @@
             <string>Save Path:</string>
            </property>
            <property name="textFormat">
-            <enum>Qt::PlainText</enum>
+            <enum>Qt::TextFormat::PlainText</enum>
            </property>
            <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
            </property>
           </widget>
          </item>
@@ -162,10 +162,10 @@
             <string>Data Path:</string>
            </property>
            <property name="textFormat">
-            <enum>Qt::PlainText</enum>
+            <enum>Qt::TextFormat::PlainText</enum>
            </property>
            <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
            </property>
           </widget>
          </item>
@@ -241,7 +241,7 @@
             <string>Maximum LOD</string>
            </property>
            <property name="alignment">
-            <set>Qt::AlignCenter</set>
+            <set>Qt::AlignmentFlag::AlignCenter</set>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout_7">
             <item>
@@ -262,10 +262,10 @@
                <bool>false</bool>
               </property>
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="tickPosition">
-               <enum>QSlider::TicksBothSides</enum>
+               <enum>QSlider::TickPosition::TicksBothSides</enum>
               </property>
               <property name="tickInterval">
                <number>10</number>
@@ -316,7 +316,7 @@
             <string>Maximum Actors (5..40)</string>
            </property>
            <property name="alignment">
-            <set>Qt::AlignCenter</set>
+            <set>Qt::AlignmentFlag::AlignCenter</set>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout_8">
             <item>
@@ -340,10 +340,10 @@
                <bool>false</bool>
               </property>
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="tickPosition">
-               <enum>QSlider::TicksBothSides</enum>
+               <enum>QSlider::TickPosition::TicksBothSides</enum>
               </property>
               <property name="tickInterval">
                <number>5</number>
@@ -402,6 +402,61 @@
         </layout>
        </widget>
       </item>
+      <item>
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Transition Type</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="transitionTypeComboBox">
+        <property name="toolTip">
+         <string>Sets the transition effect to be used in game.</string>
+        </property>
+        <property name="currentText">
+         <string>Idle - Broken</string>
+        </property>
+        <property name="placeholderText">
+         <string/>
+        </property>
+        <item>
+         <property name="text">
+          <string>Idle - Broken</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>No Animation</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Dissolve</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Mosaic</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Wipe Down</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Windows</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Unknown - Broken</string>
+         </property>
+        </item>
+       </widget>
+      </item>
       <item>
        <widget class="QGroupBox" name="advancedGroup">
         <property name="maximumSize">
@@ -417,7 +472,7 @@
          <string/>
         </property>
         <property name="alignment">
-         <set>Qt::AlignCenter</set>
+         <set>Qt::AlignmentFlag::AlignCenter</set>
         </property>
         <property name="flat">
          <bool>false</bool>
@@ -453,7 +508,7 @@
             <string>Direct 3D Devices</string>
            </property>
            <property name="alignment">
-            <set>Qt::AlignCenter</set>
+            <set>Qt::AlignmentFlag::AlignCenter</set>
            </property>
           </widget>
          </item>
@@ -475,13 +530,13 @@
             </size>
            </property>
            <property name="editTriggers">
-            <set>QAbstractItemView::NoEditTriggers</set>
+            <set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
            </property>
            <property name="alternatingRowColors">
             <bool>true</bool>
            </property>
            <property name="selectionBehavior">
-            <enum>QAbstractItemView::SelectRows</enum>
+            <enum>QAbstractItemView::SelectionBehavior::SelectRows</enum>
            </property>
           </widget>
          </item>