From cefa0ac18c23ce896052a9c122eccc96e9f2b496 Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Sun, 19 Aug 2018 10:42:11 -1000
Subject: [PATCH] Ensure all post-show widgets are constructed with a parent

---
 Editor/SongGroupEditor.cpp  |  6 +++-
 Editor/SoundGroupEditor.cpp |  2 +-
 Editor/resources/lang_de.ts | 68 ++++++++++++++++++-------------------
 3 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/Editor/SongGroupEditor.cpp b/Editor/SongGroupEditor.cpp
index 1dac26c..5749fcf 100644
--- a/Editor/SongGroupEditor.cpp
+++ b/Editor/SongGroupEditor.cpp
@@ -337,7 +337,10 @@ void MIDIFileDelegate::setModelData(QWidget* editor, QAbstractItemModel* m, cons
     const SetupListModel* model = static_cast<const SetupListModel*>(index.model());
     auto entry = model->m_sorted[index.row()];
     if (g_MainWindow->projectModel()->getMIDIPathOfSong(entry->first) == widget->path())
+    {
+        emit m->dataChanged(index, index);
         return;
+    }
     g_MainWindow->pushUndoCommand(new SongMIDIPathChangeUndoCommand(model->m_node.get(),
         tr("Change MIDI Path"), entry->first, widget->path()));
     emit m->dataChanged(index, index);
@@ -1417,7 +1420,8 @@ void SongGroupEditor::setupDataChanged()
                 std::vector<uint8_t> arrData = LoadSongFile(g_MainWindow->projectModel()->dir().absoluteFilePath(path));
                 if (!arrData.empty())
                 {
-                    MIDIPlayerWidget* newW = new MIDIPlayerWidget(index, m_setupList.m_node->m_id, p.m_it->first, std::move(arrData));
+                    MIDIPlayerWidget* newW = new MIDIPlayerWidget(index, m_setupList.m_node->m_id, p.m_it->first,
+                        std::move(arrData), m_setupTable->m_listView->viewport());
                     m_setupTable->m_listView->setIndexWidget(index, newW);
                 }
                 else
diff --git a/Editor/SoundGroupEditor.cpp b/Editor/SoundGroupEditor.cpp
index 646bdee..70cd492 100644
--- a/Editor/SoundGroupEditor.cpp
+++ b/Editor/SoundGroupEditor.cpp
@@ -645,7 +645,7 @@ void SoundGroupEditor::sfxDataChanged()
         SFXPlayerWidget* w = qobject_cast<SFXPlayerWidget*>(m_sfxTable->indexWidget(index));
         if (!w || w->sfxId() != p->first)
         {
-            SFXPlayerWidget* newW = new SFXPlayerWidget(index, m_sfxs.m_node->m_id, p->first);
+            SFXPlayerWidget* newW = new SFXPlayerWidget(index, m_sfxs.m_node->m_id, p->first, m_sfxTable->viewport());
             m_sfxTable->setIndexWidget(index, newW);
         }
         ++idx;
diff --git a/Editor/resources/lang_de.ts b/Editor/resources/lang_de.ts
index 3bfb078..f350b3f 100644
--- a/Editor/resources/lang_de.ts
+++ b/Editor/resources/lang_de.ts
@@ -329,7 +329,7 @@
 <context>
     <name>MIDIFileDelegate</name>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="342"/>
+        <location filename="../SongGroupEditor.cpp" line="345"/>
         <source>Change MIDI Path</source>
         <translation type="unfinished"></translation>
     </message>
@@ -350,13 +350,13 @@
 <context>
     <name>MIDIPlayerWidget</name>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="1192"/>
+        <location filename="../SongGroupEditor.cpp" line="1195"/>
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="1206"/>
-        <location filename="../SongGroupEditor.cpp" line="1229"/>
+        <location filename="../SongGroupEditor.cpp" line="1209"/>
+        <location filename="../SongGroupEditor.cpp" line="1232"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1002,38 +1002,38 @@
 <context>
     <name>PageModel</name>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="468"/>
+        <location filename="../SongGroupEditor.cpp" line="471"/>
         <source>Program Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="469"/>
+        <location filename="../SongGroupEditor.cpp" line="472"/>
         <source>Program %1 is already defined in table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="475"/>
-        <location filename="../SongGroupEditor.cpp" line="501"/>
+        <location filename="../SongGroupEditor.cpp" line="478"/>
+        <location filename="../SongGroupEditor.cpp" line="504"/>
         <source>Change %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="515"/>
+        <location filename="../SongGroupEditor.cpp" line="518"/>
         <source>Program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="517"/>
+        <location filename="../SongGroupEditor.cpp" line="520"/>
         <source>Object</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="519"/>
+        <location filename="../SongGroupEditor.cpp" line="522"/>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="521"/>
+        <location filename="../SongGroupEditor.cpp" line="524"/>
         <source>Max Voices</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1067,12 +1067,12 @@
 <context>
     <name>PageTableView</name>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="1052"/>
+        <location filename="../SongGroupEditor.cpp" line="1055"/>
         <source>Delete Page Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="1052"/>
+        <location filename="../SongGroupEditor.cpp" line="1055"/>
         <source>Delete Page Entry</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1490,27 +1490,27 @@
 <context>
     <name>SetupListModel</name>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="741"/>
+        <location filename="../SongGroupEditor.cpp" line="744"/>
         <source>Song Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="742"/>
+        <location filename="../SongGroupEditor.cpp" line="745"/>
         <source>Song %1 is already defined in project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="747"/>
+        <location filename="../SongGroupEditor.cpp" line="750"/>
         <source>Change Song Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="764"/>
+        <location filename="../SongGroupEditor.cpp" line="767"/>
         <source>Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="766"/>
+        <location filename="../SongGroupEditor.cpp" line="769"/>
         <source>MIDI File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1518,32 +1518,32 @@
 <context>
     <name>SetupModel</name>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="987"/>
+        <location filename="../SongGroupEditor.cpp" line="990"/>
         <source>Change %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="1004"/>
+        <location filename="../SongGroupEditor.cpp" line="1007"/>
         <source>Program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="1006"/>
+        <location filename="../SongGroupEditor.cpp" line="1009"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="1008"/>
+        <location filename="../SongGroupEditor.cpp" line="1011"/>
         <source>Panning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="1010"/>
+        <location filename="../SongGroupEditor.cpp" line="1013"/>
         <source>Reverb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="1012"/>
+        <location filename="../SongGroupEditor.cpp" line="1015"/>
         <source>Chorus</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1551,12 +1551,12 @@
 <context>
     <name>SetupTableView</name>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="1115"/>
+        <location filename="../SongGroupEditor.cpp" line="1118"/>
         <source>Delete Setup Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="1115"/>
+        <location filename="../SongGroupEditor.cpp" line="1118"/>
         <source>Delete Setup Entry</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1564,37 +1564,37 @@
 <context>
     <name>SongGroupEditor</name>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="1501"/>
+        <location filename="../SongGroupEditor.cpp" line="1505"/>
         <source>Add new page entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="1503"/>
+        <location filename="../SongGroupEditor.cpp" line="1507"/>
         <source>Remove selected page entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="1470"/>
+        <location filename="../SongGroupEditor.cpp" line="1474"/>
         <source>Normal Pages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="1300"/>
+        <location filename="../SongGroupEditor.cpp" line="1303"/>
         <source>Add Page Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="1312"/>
+        <location filename="../SongGroupEditor.cpp" line="1315"/>
         <source>Add Setup Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="1471"/>
+        <location filename="../SongGroupEditor.cpp" line="1475"/>
         <source>Drum Pages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SongGroupEditor.cpp" line="1472"/>
+        <location filename="../SongGroupEditor.cpp" line="1476"/>
         <source>MIDI Setups</source>
         <translation type="unfinished"></translation>
     </message>