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

empty map name check, increase max dimensions

Browse source
This commit is contained in:
garak 2018-10-14 09:01:04 -04:00
parent d4d15d17be
commit be44e4b918
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
forms/newmappopup.ui
View file

@ -61,7 +61,11 @@
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QSpinBox" name="spinBox_NewMap_Width"/> <widget class="QSpinBox" name="spinBox_NewMap_Width">
<property name="maximum">
<number>200</number>
</property>
</widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_NewMap_Height"> <widget class="QLabel" name="label_NewMap_Height">
@ -71,7 +75,11 @@
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QSpinBox" name="spinBox_NewMap_Height"/> <widget class="QSpinBox" name="spinBox_NewMap_Height">
<property name="maximum">
<number>200</number>
</property>
</widget>
</item> </item>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="label_NewMap_Primary_Tileset"> <widget class="QLabel" name="label_NewMap_Primary_Tileset">

2
src/ui/newmappopup.cpp
View file

@ -63,7 +63,7 @@ void NewMapPopup::on_pushButton_NewMap_Accept_clicked() {
// If map name is not unique, use default value. Also replace spaces with underscores. // If map name is not unique, use default value. Also replace spaces with underscores.
QString newMapName = this->ui->lineEdit_NewMap_Name->text().replace(" ","_"); QString newMapName = this->ui->lineEdit_NewMap_Name->text().replace(" ","_");
if (project->mapNames->contains(newMapName)) { if (project->mapNames->contains(newMapName) || newMapName.isEmpty()) {
newMapName = project->getNewMapName(); newMapName = project->getNewMapName();
} }
newMap->name = newMapName; newMap->name = newMapName;