atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Remove checkbox for enabling triple metatile layers.

Browse source
This commit is contained in:
ultima-soul 2020-06-25 16:48:49 -07:00 committed by huderlem
parent debb1c66ac
commit 8ceb783056
3 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
forms/mainwindow.ui
View file

@ -263,7 +263,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<property name="movable" stdset="0"> <property name="movable" stdset="0">
<bool>false</bool> <bool>false</bool>
@ -2755,7 +2755,6 @@
<addaction name="actionUse_Encounter_Json"/> <addaction name="actionUse_Encounter_Json"/>
<addaction name="actionMonitor_Project_Files"/> <addaction name="actionMonitor_Project_Files"/>
<addaction name="actionUse_Poryscript"/> <addaction name="actionUse_Poryscript"/>
<addaction name="actionUse_Triple_Layer_Metatiles"/>
</widget> </widget>
<addaction name="menuFile"/> <addaction name="menuFile"/>
<addaction name="menuEdit"/> <addaction name="menuEdit"/>
@ -3029,14 +3028,6 @@
<string>Export Map Stitch Image...</string> <string>Export Map Stitch Image...</string>
</property> </property>
</action> </action>
<action name="actionUse_Triple_Layer_Metatiles">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Use Triple Layer Metatiles</string>
</property>
</action>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<customwidgets> <customwidgets>

1
include/mainwindow.h
View file

@ -148,7 +148,6 @@ private slots:
void on_actionUse_Encounter_Json_triggered(bool checked); void on_actionUse_Encounter_Json_triggered(bool checked);
void on_actionMonitor_Project_Files_triggered(bool checked); void on_actionMonitor_Project_Files_triggered(bool checked);
void on_actionUse_Poryscript_triggered(bool checked); void on_actionUse_Poryscript_triggered(bool checked);
void on_actionUse_Triple_Layer_Metatiles_triggered(bool checked);
void on_mainTabBar_tabBarClicked(int index); void on_mainTabBar_tabBarClicked(int index);

10
src/mainwindow.cpp
View file

@ -165,7 +165,6 @@ void MainWindow::setProjectSpecificUIVisibility()
{ {
ui->actionUse_Encounter_Json->setChecked(projectConfig.getEncounterJsonActive()); ui->actionUse_Encounter_Json->setChecked(projectConfig.getEncounterJsonActive());
ui->actionUse_Poryscript->setChecked(projectConfig.getUsePoryScript()); ui->actionUse_Poryscript->setChecked(projectConfig.getUsePoryScript());
ui->actionUse_Triple_Layer_Metatiles->setChecked(projectConfig.getTripleLayerMetatilesEnabled());
ui->mainTabBar->setTabEnabled(4, projectConfig.getEncounterJsonActive()); ui->mainTabBar->setTabEnabled(4, projectConfig.getEncounterJsonActive());
@ -1329,15 +1328,6 @@ void MainWindow::on_actionUse_Poryscript_triggered(bool checked)
projectConfig.setUsePoryScript(checked); projectConfig.setUsePoryScript(checked);
} }
void MainWindow::on_actionUse_Triple_Layer_Metatiles_triggered(bool checked)
{
QMessageBox warning(this);
warning.setText("You must reload the project for this setting to take effect.");
warning.setIcon(QMessageBox::Information);
warning.exec();
projectConfig.setTripleLayerMetatilesEnabled(checked);
}
void MainWindow::on_actionPencil_triggered() void MainWindow::on_actionPencil_triggered()
{ {
on_toolButton_Paint_clicked(); on_toolButton_Paint_clicked();