diff options
Diffstat (limited to 'muse2')
| -rw-r--r-- | muse2/ChangeLog | 3 | ||||
| -rw-r--r-- | muse2/muse/app.cpp | 15 | ||||
| -rw-r--r-- | muse2/muse/cobject.cpp | 2 | ||||
| -rw-r--r-- | muse2/muse/midieditor.cpp | 1 |
4 files changed, 12 insertions, 9 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog index f85f371d..d4bfcafd 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,4 +1,7 @@ 21.11.2010 + - Oops, fixed regression, marker view and cliplist crashes, removed setAttribute(Qt::WA_DeleteOnClose) + from TopWin constructor, and added it to individual TopWin sub-classes (only MidiEditor needs it). (Tim) +21.11.2010 - All menus now use QActions. Some shortcuts are left to be assigned correctly (Orcan) - Clean up: Remove submenu integer ids from the MusE class in favor of QActions (Orcan) - Ported the following .ui widgets to Qt4: didyouknow, transposebase, cliplist, diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp index 362fee2c..502f97ef 100644 --- a/muse2/muse/app.cpp +++ b/muse2/muse/app.cpp @@ -2179,8 +2179,7 @@ void MusE::showMarker(bool flag) toplevels.push_back(Toplevel(Toplevel::MARKER, (unsigned long)(markerView), markerView)); markerView->show(); } - - markerView->setShown(flag); + markerView->setVisible(flag); viewMarkerAction->setChecked(flag); } @@ -2208,7 +2207,7 @@ void MusE::toggleTransport(bool checked) void MusE::showTransport(bool flag) { - transport->setShown(flag); + transport->setVisible(flag); viewTransportAction->setChecked(flag); } @@ -4597,7 +4596,7 @@ void MusE::openAudioFileManagement() audioFileManager = new AudioFileManager(this, "audiofilemanager", false); audioFileManager->show(); } - audioFileManager->setShown(true); + audioFileManager->setVisible(true); } #endif //--------------------------------------------------------- @@ -5084,7 +5083,7 @@ void MusE::showBigtime(bool on) bigtime->move(config.geometryBigTime.topLeft()); } if (bigtime) - bigtime->setShown(on); + bigtime->setVisible(on); viewBigtimeAction->setChecked(on); } @@ -5120,7 +5119,7 @@ void MusE::showMixer(bool on) audioMixer->move(config.geometryMixer.topLeft()); } if (audioMixer) - audioMixer->setShown(on); + audioMixer->setVisible(on); menuView->setItemChecked(aid1, on); } */ @@ -5138,7 +5137,7 @@ void MusE::showMixer1(bool on) mixer1->move(config.mixer1.geometry.topLeft()); } if (mixer1) - mixer1->setShown(on); + mixer1->setVisible(on); viewMixerAAction->setChecked(on); } @@ -5155,7 +5154,7 @@ void MusE::showMixer2(bool on) mixer2->move(config.mixer2.geometry.topLeft()); } if (mixer2) - mixer2->setShown(on); + mixer2->setVisible(on); viewMixerBAction->setChecked(on); } diff --git a/muse2/muse/cobject.cpp b/muse2/muse/cobject.cpp index e601d221..dc257425 100644 --- a/muse2/muse/cobject.cpp +++ b/muse2/muse/cobject.cpp @@ -60,7 +60,7 @@ TopWin::TopWin(QWidget* parent, const char* name, Qt::WindowFlags f) : QMainWindow(parent, f) { setObjectName(QString(name)); - setAttribute(Qt::WA_DeleteOnClose); + //setAttribute(Qt::WA_DeleteOnClose); // Allow multiple rows. Tim. //setDockNestingEnabled(true); setIconSize(ICON_SIZE); diff --git a/muse2/muse/midieditor.cpp b/muse2/muse/midieditor.cpp index 360245cc..8816465c 100644 --- a/muse2/muse/midieditor.cpp +++ b/muse2/muse/midieditor.cpp @@ -26,6 +26,7 @@ MidiEditor::MidiEditor(int q, int r, PartList* pl, QWidget* parent, const char* name) : TopWin(parent, name) { + setAttribute(Qt::WA_DeleteOnClose); _pl = pl; if (_pl) for (iPart i = _pl->begin(); i != _pl->end(); ++i) |