From: Robert J. <spa...@us...> - 2005-07-29 12:24:51
|
Update of /cvsroot/lmuse/muse/muse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17645/muse Modified Files: app.cpp conf.cpp Log Message: gui fixes Index: conf.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/conf.cpp,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** conf.cpp 14 Jun 2005 21:15:31 -0000 1.58 --- conf.cpp 29 Jul 2005 12:24:18 -0000 1.59 *************** *** 552,556 **** if (!midiSyncConfig) midiSyncConfig = new MidiSyncConfig(this); ! midiSyncConfig->show(); } --- 552,562 ---- if (!midiSyncConfig) midiSyncConfig = new MidiSyncConfig(this); ! ! if (midiSyncConfig->isVisible()) { ! midiSyncConfig->raise(); ! midiSyncConfig->setActiveWindow(); ! } ! else ! midiSyncConfig->show(); } *************** *** 564,568 **** midiFileConfig = new MidiFileConfig(); midiFileConfig->updateValues(); ! midiFileConfig->show(); } --- 570,580 ---- midiFileConfig = new MidiFileConfig(); midiFileConfig->updateValues(); ! ! if (midiFileConfig->isVisible()) { ! midiFileConfig->raise(); ! midiFileConfig->setActiveWindow(); ! } ! else ! midiFileConfig->show(); } *************** *** 633,637 **** if (!globalSettingsConfig) globalSettingsConfig = new GlobalSettingsConfig(); ! globalSettingsConfig->show(); } --- 645,655 ---- if (!globalSettingsConfig) globalSettingsConfig = new GlobalSettingsConfig(); ! ! if (globalSettingsConfig->isVisible()) { ! globalSettingsConfig->raise(); ! globalSettingsConfig->setActiveWindow(); ! } ! else ! globalSettingsConfig->show(); } Index: app.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/app.cpp,v retrieving revision 1.172 retrieving revision 1.173 diff -C2 -d -r1.172 -r1.173 *** app.cpp 14 Jun 2005 21:15:31 -0000 1.172 --- app.cpp 29 Jul 2005 12:24:18 -0000 1.173 *************** *** 1137,1140 **** --- 1137,1141 ---- // museProject = QFileInfo(fn).dirPath(true); loadProjectFile(fn, true, true); + setUntitledProject(); } } |