1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00

Fixes following reviews

This commit is contained in:
MichalZr6
2025-04-05 18:13:24 +02:00
parent 9964545e7a
commit f98155a785
8 changed files with 40 additions and 78 deletions

View File

@@ -609,14 +609,7 @@ void MainWindow::on_actionCampaignEditor_triggered()
void MainWindow::on_actionNew_triggered()
{
if(getAnswerAboutUnsavedChanges())
{
new WindowNewMap(this);
//mapSettings = new MapSettings(controller, this);
//connect(&controller, &MapController::requestModsUpdate,
// mapSettings->getModSettings(), &ModSettings::updateModWidgetBasedOnMods);
//controller.requestModsUpdate({}, true);
}
}
void MainWindow::on_actionSave_triggered()
@@ -1136,9 +1129,6 @@ void MainWindow::on_inspectorWidget_itemChanged(QTableWidgetItem *item)
void MainWindow::on_actionMapSettings_triggered()
{
if(!mapSettings)
return;
if(mapSettings->isVisible())
{
mapSettings->raise();
@@ -1146,8 +1136,6 @@ void MainWindow::on_actionMapSettings_triggered()
}
else
{
mapSettings->setWindowModality(Qt::WindowModal);
mapSettings->setModal(true);
mapSettings->show();
}
}
@@ -1178,15 +1166,15 @@ void MainWindow::switchDefaultPlayer(const PlayerColor & player)
{
if(controller.defaultPlayer == player)
return;
ui->actionNeutral->blockSignals(true);
QSignalBlocker blockerNeutral(ui->actionNeutral);
ui->actionNeutral->setChecked(PlayerColor::NEUTRAL == player);
ui->actionNeutral->blockSignals(false);
for(int i = 0; i < PlayerColor::PLAYER_LIMIT.getNum(); ++i)
{
getActionPlayer(PlayerColor(i))->blockSignals(true);
getActionPlayer(PlayerColor(i))->setChecked(PlayerColor(i) == player);
getActionPlayer(PlayerColor(i))->blockSignals(false);
QAction * playerEntry = getActionPlayer(PlayerColor(i));
QSignalBlocker blocker(playerEntry);
playerEntry->setChecked(PlayerColor(i) == player);
}
controller.defaultPlayer = player;
}