games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-07 00:58:39 +02:00
Code Issues Releases Activity

Temporarily (?) removed "Finish" tab from Setup

Browse Source
This commit is contained in:
Ivan Savenko
2023-03-12 13:28:09 +02:00
parent c3d78ba761
commit 9c92d97f98
3 changed files with 89 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
launcher/firstLaunch/firstlaunch_moc.cpp
View File

@ -49,11 +49,6 @@ void FirstLaunchView::on_buttonTabModPreset_clicked()
activateTabModPreset(); activateTabModPreset();
} }
void FirstLaunchView::on_buttonTabFinish_clicked()
{
activateTabFinish();
}
void FirstLaunchView::on_listWidgetLanguage_currentRowChanged(int currentRow) void FirstLaunchView::on_listWidgetLanguage_currentRowChanged(int currentRow)
{ {
languageSelected(ui->listWidgetLanguage->item(currentRow)->data(Qt::UserRole).toString()); languageSelected(ui->listWidgetLanguage->item(currentRow)->data(Qt::UserRole).toString());
@ -121,7 +116,6 @@ void FirstLaunchView::setSetupProgress(int progress)
ui->buttonTabLanguage->setDisabled(value < 1); ui->buttonTabLanguage->setDisabled(value < 1);
ui->buttonTabHeroesData->setDisabled(value < 2); ui->buttonTabHeroesData->setDisabled(value < 2);
ui->buttonTabModPreset->setDisabled(value < 3); ui->buttonTabModPreset->setDisabled(value < 3);
ui->buttonTabFinish->setDisabled(value < 4);
} }
void FirstLaunchView::activateTabLanguage() void FirstLaunchView::activateTabLanguage()
@ -131,7 +125,6 @@ void FirstLaunchView::activateTabLanguage()
ui->buttonTabLanguage->setChecked(true); ui->buttonTabLanguage->setChecked(true);
ui->buttonTabHeroesData->setChecked(false); ui->buttonTabHeroesData->setChecked(false);
ui->buttonTabModPreset->setChecked(false); ui->buttonTabModPreset->setChecked(false);
ui->buttonTabFinish->setChecked(false);
} }
void FirstLaunchView::activateTabHeroesData() void FirstLaunchView::activateTabHeroesData()
@ -141,7 +134,6 @@ void FirstLaunchView::activateTabHeroesData()
ui->buttonTabLanguage->setChecked(false); ui->buttonTabLanguage->setChecked(false);
ui->buttonTabHeroesData->setChecked(true); ui->buttonTabHeroesData->setChecked(true);
ui->buttonTabModPreset->setChecked(false); ui->buttonTabModPreset->setChecked(false);
ui->buttonTabFinish->setChecked(false);
if(!hasVCMIBuilderScript) if(!hasVCMIBuilderScript)
{ {
@ -158,21 +150,10 @@ void FirstLaunchView::activateTabModPreset()
ui->buttonTabLanguage->setChecked(false); ui->buttonTabLanguage->setChecked(false);
ui->buttonTabHeroesData->setChecked(false); ui->buttonTabHeroesData->setChecked(false);
ui->buttonTabModPreset->setChecked(true); ui->buttonTabModPreset->setChecked(true);
ui->buttonTabFinish->setChecked(false);
modPresetUpdate(); modPresetUpdate();
} }
void FirstLaunchView::activateTabFinish()
{
setSetupProgress(4);
ui->installerTabs->setCurrentIndex(3);
ui->buttonTabLanguage->setChecked(false);
ui->buttonTabModPreset->setChecked(false);
ui->buttonTabHeroesData->setChecked(false);
ui->buttonTabFinish->setChecked(true);
}
void FirstLaunchView::exitSetup() void FirstLaunchView::exitSetup()
{ {
//TODO: unlock UI, switch to another tab (mods?) //TODO: unlock UI, switch to another tab (mods?)
@ -443,6 +424,6 @@ void FirstLaunchView::on_pushButtonPresetBack_clicked()
void FirstLaunchView::on_pushButtonPresetNext_clicked() void FirstLaunchView::on_pushButtonPresetNext_clicked()
{ {
activateTabFinish(); exitSetup();
} }

2
launcher/firstLaunch/firstlaunch_moc.h
View File

@ -36,7 +36,6 @@ class FirstLaunchView : public QWidget
void activateTabLanguage(); void activateTabLanguage();
void activateTabHeroesData(); void activateTabHeroesData();
void activateTabModPreset(); void activateTabModPreset();
void activateTabFinish();
void exitSetup(); void exitSetup();
// Tab Language // Tab Language
@ -82,7 +81,6 @@ private slots:
void on_buttonTabLanguage_clicked(); void on_buttonTabLanguage_clicked();
void on_buttonTabHeroesData_clicked(); void on_buttonTabHeroesData_clicked();
void on_buttonTabModPreset_clicked(); void on_buttonTabModPreset_clicked();
void on_buttonTabFinish_clicked();
void on_listWidgetLanguage_currentRowChanged(int currentRow); void on_listWidgetLanguage_currentRowChanged(int currentRow);
void on_pushButtonLanguageNext_clicked(); void on_pushButtonLanguageNext_clicked();
void on_pushButtonDataNext_clicked(); void on_pushButtonDataNext_clicked();

258
launcher/firstLaunch/firstlaunch_moc.ui
View File

@ -91,31 +91,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QToolButton" name="buttonTabFinish">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Finish</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextOnly</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@ -124,7 +99,7 @@
<number>0</number> <number>0</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>4</number> <number>3</number>
</property> </property>
<property name="value"> <property name="value">
<number>0</number> <number>0</number>
@ -564,8 +539,8 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QGridLayout" name="gridLayout_4" rowstretch="1,0,0,0"> <layout class="QGridLayout" name="gridLayout_4" rowstretch="1,0,0,0,0" columnstretch="3,1">
<item row="2" column="0"> <item row="3" column="0">
<widget class="QLabel" name="labelPresetHota"> <widget class="QLabel" name="labelPresetHota">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@ -581,71 +556,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="2" column="0">
<widget class="QToolButton" name="toolButtonPresetLanguage">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Install localization</string>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextOnly</enum>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="labelPresetWog">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>100</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>VCMI provides compatible version of the &quot;In The Wake of Gods&quot; fan-made addon</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QToolButton" name="toolButtonPresetHota">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Install Horn of the Abyss</string>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextOnly</enum>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QToolButton" name="toolButtonPresetWog">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Install In the Wake of Gods</string>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextOnly</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelPresetExtras"> <widget class="QLabel" name="labelPresetExtras">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@ -661,7 +572,71 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="2" column="1">
<widget class="QToolButton" name="toolButtonPresetExtras">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Install HD support</string>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextOnly</enum>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QToolButton" name="toolButtonPresetWog">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Install In the Wake of Gods</string>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextOnly</enum>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QToolButton" name="toolButtonPresetLanguage">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Install localization</string>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextOnly</enum>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="labelPresetWog">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>100</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>VCMI provides compatible version of the &quot;In The Wake of Gods&quot; fan-made addon</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelPresetLanguage"> <widget class="QLabel" name="labelPresetLanguage">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@ -677,8 +652,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="3" column="1">
<widget class="QToolButton" name="toolButtonPresetExtras"> <widget class="QToolButton" name="toolButtonPresetHota">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -686,13 +661,29 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Install HD support</string> <string>Install Horn of the Abyss</string>
</property> </property>
<property name="toolButtonStyle"> <property name="toolButtonStyle">
<enum>Qt::ToolButtonTextOnly</enum> <enum>Qt::ToolButtonTextOnly</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="labelPresetDescription">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>100</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Optionally, you can install additional mods either now or at any point later</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@ -732,79 +723,6 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="pushButtonPresetNext"> <widget class="QPushButton" name="pushButtonPresetNext">
<property name="text">
<string>Skip</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="pageFinish">
<layout class="QVBoxLayout" name="verticalLayout_2">
<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="QLabel" name="label_7">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Join community / get help</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_7">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButtonFinishBack">
<property name="text">
<string>Back</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonFinishExit">
<property name="text"> <property name="text">
<string>Finish</string> <string>Finish</string>
</property> </property>