From 16d25796bf4344abdb73ab3bf9b807702da37064 Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 15 Aug 2019 20:26:47 -0400 Subject: [PATCH] use the custom combobox for all porymap comboboxes --- forms/mainwindow.ui | 18 +++++++++--------- forms/mapimageexporter.ui | 2 +- forms/newmappopup.ui | 6 +++--- forms/regionmapeditor.ui | 8 ++++---- include/mainwindow.h | 6 +++--- src/mainwindow.cpp | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui index 8aa623ee..1f215f3d 100644 --- a/forms/mainwindow.ui +++ b/forms/mainwindow.ui @@ -1932,7 +1932,7 @@ - + <html><head/><body><p>The default background music for this map.</p></body></html> @@ -1949,7 +1949,7 @@ - + <html><head/><body><p>The section of the region map which the map is grouped under. This also determines the name of the map that is display when the player enters it.</p></body></html> @@ -1983,7 +1983,7 @@ - + <html><head/><body><p>The default weather for this map.</p></body></html> @@ -2000,7 +2000,7 @@ - + <html><head/><body><p>The map type is a general attribute, which is used for many different things. For example. it determines whether biking or running is allowed.</p></body></html> @@ -2017,7 +2017,7 @@ - + <html><head/><body><p>Determines the type of battle scene graphics to use.</p></body></html> @@ -2419,7 +2419,7 @@ - + <html><head/><body><p>The destination map name of the connection.</p></body></html> @@ -2449,7 +2449,7 @@ - + <html><head/><body><p>The direction of the connection.</p></body></html> @@ -2643,7 +2643,7 @@ - + <html><head/><body><p>Destination map name when using <span style=" font-weight:600;">Dive</span>. If empty, no such connection will exist.</p></body></html> @@ -2660,7 +2660,7 @@ - + <html><head/><body><p>Destination map name when emerging using <span style=" font-weight:600;">Dive</span>. If empty, no such connection will exist.</p></body></html> diff --git a/forms/mapimageexporter.ui b/forms/mapimageexporter.ui index d82ce2fa..c25f6cad 100644 --- a/forms/mapimageexporter.ui +++ b/forms/mapimageexporter.ui @@ -131,7 +131,7 @@ - + QComboBox::AdjustToContents diff --git a/forms/newmappopup.ui b/forms/newmappopup.ui index 9cab8872..209c078d 100644 --- a/forms/newmappopup.ui +++ b/forms/newmappopup.ui @@ -61,7 +61,7 @@ - + <html><head/><body><p>New map group.</p></body></html> @@ -146,7 +146,7 @@ - + <html><head/><body><p>The map type is a general attribute, which is used for many different things. For example. it determines whether biking or running is allowed.</p></body></html> @@ -163,7 +163,7 @@ - + <html><head/><body><p>The section of the region map which the map is grouped under. This also determines the name of the map that is displayed when the player enters it.</p></body></html> diff --git a/forms/regionmapeditor.ui b/forms/regionmapeditor.ui index 7396b5db..e793f19f 100644 --- a/forms/regionmapeditor.ui +++ b/forms/regionmapeditor.ui @@ -773,7 +773,7 @@ - + 0 @@ -809,7 +809,7 @@ - + <html><head/><body><p>The map type is a general attribute, which is used for many different things. For example. it determines whether biking or running is allowed.</p></body></html> @@ -887,7 +887,7 @@ - + true @@ -1030,7 +1030,7 @@ - + diff --git a/include/mainwindow.h b/include/mainwindow.h index 8aae0fed..11a12017 100644 --- a/include/mainwindow.h +++ b/include/mainwindow.h @@ -111,11 +111,11 @@ private slots: void on_comboBox_ConnectionDirection_currentIndexChanged(const QString &arg1); void on_spinBox_ConnectionOffset_valueChanged(int offset); - void on_comboBox_ConnectedMap_currentTextChanged(const QString &mapName); + void on_comboBox_ConnectedMap_activated(const QString &mapName); void on_pushButton_AddConnection_clicked(); void on_pushButton_RemoveConnection_clicked(); - void on_comboBox_DiveMap_currentTextChanged(const QString &mapName); - void on_comboBox_EmergeMap_currentTextChanged(const QString &mapName); + void on_comboBox_DiveMap_activated(const QString &mapName); + void on_comboBox_EmergeMap_activated(const QString &mapName); void on_comboBox_PrimaryTileset_activated(const QString &arg1); void on_comboBox_SecondaryTileset_activated(const QString &arg1); void on_pushButton_clicked(); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 9776384b..ddf99da3 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1942,7 +1942,7 @@ void MainWindow::on_spinBox_ConnectionOffset_valueChanged(int offset) editor->updateConnectionOffset(offset); } -void MainWindow::on_comboBox_ConnectedMap_currentTextChanged(const QString &mapName) +void MainWindow::on_comboBox_ConnectedMap_activated(const QString &mapName) { editor->setConnectionMap(mapName); } @@ -1957,12 +1957,12 @@ void MainWindow::on_pushButton_RemoveConnection_clicked() editor->removeCurrentConnection(); } -void MainWindow::on_comboBox_DiveMap_currentTextChanged(const QString &mapName) +void MainWindow::on_comboBox_DiveMap_activated(const QString &mapName) { editor->updateDiveMap(mapName); } -void MainWindow::on_comboBox_EmergeMap_currentTextChanged(const QString &mapName) +void MainWindow::on_comboBox_EmergeMap_activated(const QString &mapName) { editor->updateEmergeMap(mapName); }