diff --git a/src/GUIFileList.txt b/src/GUIFileList.txt index 37838f6..4f65cfa 100644 --- a/src/GUIFileList.txt +++ b/src/GUIFileList.txt @@ -728,8 +728,8 @@ SET(gui_SRCS gui/general/StaffLine.h gui/kdeext/KLedButton.cpp gui/kdeext/KLedButton.h - gui/kdeext/KStartupLogo.cpp - gui/kdeext/KStartupLogo.h + gui/kdeext/TDEStartupLogo.cpp + gui/kdeext/TDEStartupLogo.h gui/kdeext/KTmpStatusMsg.cpp gui/kdeext/KTmpStatusMsg.h gui/kdeext/QCanvasGroupableItem.cpp diff --git a/src/document/RoseXmlHandler.cpp b/src/document/RoseXmlHandler.cpp index 29f209c..1dc572b 100644 --- a/src/document/RoseXmlHandler.cpp +++ b/src/document/RoseXmlHandler.cpp @@ -52,7 +52,7 @@ #include "gui/application/RosegardenApplication.h" #include "gui/dialogs/FileLocateDialog.h" #include "gui/general/ProgressReporter.h" -#include "gui/kdeext/KStartupLogo.h" +#include "gui/kdeext/TDEStartupLogo.h" #include "gui/studio/AudioPlugin.h" #include "gui/studio/AudioPluginManager.h" #include "gui/widgets/CurrentProgressDialog.h" @@ -447,7 +447,7 @@ RoseXmlHandler::startElement(const TQString& namespaceURI, minor > RosegardenGUIDoc::FILE_FORMAT_VERSION_MINOR) { CurrentProgressDialog::freeze(); - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); KMessageBox::information(0, i18n("This file was written by Rosegarden %1, which is more recent than this version.\nThere may be some incompatibilities with the file format.").arg(version)); @@ -1032,7 +1032,7 @@ RoseXmlHandler::startElement(const TQString& namespaceURI, CurrentProgressDialog::freeze(); // Hide splash screen if present on startup - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); // Create a locate file dialog - give it the file name // and the AudioFileManager path that we've already diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp index 6d38f5c..028e7d3 100644 --- a/src/document/RosegardenGUIDoc.cpp +++ b/src/document/RosegardenGUIDoc.cpp @@ -71,7 +71,7 @@ #include "gui/editors/segment/TrackLabel.h" #include "gui/general/EditViewBase.h" #include "gui/general/GUIPalette.h" -#include "gui/kdeext/KStartupLogo.h" +#include "gui/kdeext/TDEStartupLogo.h" #include "gui/seqmanager/SequenceManager.h" #include "gui/studio/AudioPluginManager.h" #include "gui/studio/StudioControl.h" @@ -576,7 +576,7 @@ bool RosegardenGUIDoc::openDocument(const TQString& filename, // Check if file readable with fileInfo ? if (!fileInfo.isReadable() || fileInfo.isDir()) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); TQString msg(i18n("Can't open file '%1'").arg(filename)); KMessageBox::sorry(0, msg); return false; @@ -637,7 +637,7 @@ bool RosegardenGUIDoc::openDocument(const TQString& filename, } if (!okay) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); TQString msg(i18n("Error when parsing file '%1': \"%2\"") .arg(filename) .arg(errMsg)); @@ -694,7 +694,7 @@ bool RosegardenGUIDoc::openDocument(const TQString& filename, // generate any audio previews after loading the files m_audioFileManager.generatePreviews(); } catch (Exception e) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); CurrentProgressDialog::freeze(); KMessageBox::error(0, strtoqstr(e.getMessage())); CurrentProgressDialog::thaw(); @@ -1601,7 +1601,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg, if (handler.isCancelled()) { RG_DEBUG << "File load cancelled\n"; - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); KMessageBox::information(0, i18n("File load cancelled")); cancelled = true; return true; @@ -1614,7 +1614,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg, if (getSequenceManager() && !(getSequenceManager()->getSoundDriverStatus() & AUDIO_OK)) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); CurrentProgressDialog::freeze(); if (handler.hasActiveAudio() || @@ -1659,7 +1659,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg, if (er == 0) er = *rates.begin(); - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); CurrentProgressDialog::freeze(); KMessageBox::information(0, i18n("
This composition contains audio files that were recorded or imported with the audio server running at a different sample rate (%1 Hz) from the current JACK server sample rate (%2 Hz).
Rosegarden will play this composition at the correct speed, but any audio files in it will probably sound awful.
Please consider re-starting the JACK server at the correct rate (%3 Hz) and re-loading this composition before you do any more work with it.
").arg(er).arg(sr).arg(er)); @@ -1669,7 +1669,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg, } else if (sr != 0 && mixed) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); CurrentProgressDialog::freeze(); KMessageBox::information(0, i18n("This composition contains audio files at more than one sample rate.
Rosegarden will play them at the correct speed, but any audio files that were recorded or imported at rates different from the current JACK server sample rate (%1 Hz) will probably sound awful.
Please see the audio file manager dialog for more details, and consider resampling any files that are at the wrong rate.
").arg(sr), @@ -1699,7 +1699,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg, } msg += ""; - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); CurrentProgressDialog::freeze(); KMessageBox::information(0, msg); CurrentProgressDialog::thaw(); @@ -1712,7 +1712,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg, TQString msg(i18n("This file contains one or more old element types that are now deprecated.\nSupport for these elements may disappear in future versions of Rosegarden.\nWe recommend you re-save this file from this version of Rosegarden to ensure that it can still be re-loaded in future versions.")); slotDocumentModified(); // so file can be re-saved immediately - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); CurrentProgressDialog::freeze(); KMessageBox::information(0, msg); CurrentProgressDialog::thaw(); @@ -2802,7 +2802,7 @@ RosegardenGUIDoc::finalizeAudioFile(InstrumentId iid) //!!! mtr just for now?: or better to do this once after the fact? //!!! m_audioFileManager.generatePreviews(); } catch (Exception e) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); CurrentProgressDialog::freeze(); KMessageBox::error(0, strtoqstr(e.getMessage())); CurrentProgressDialog::thaw(); diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp index 1cc510c..9afa803 100644 --- a/src/gui/application/RosegardenGUIApp.cpp +++ b/src/gui/application/RosegardenGUIApp.cpp @@ -139,7 +139,7 @@ #include "gui/editors/segment/TriggerSegmentManager.h" #include "gui/editors/tempo/TempoView.h" #include "gui/general/EditViewBase.h" -#include "gui/kdeext/KStartupLogo.h" +#include "gui/kdeext/TDEStartupLogo.h" #include "gui/kdeext/KTmpStatusMsg.h" #include "gui/seqmanager/MidiFilterDialog.h" #include "gui/seqmanager/SequenceManager.h" @@ -312,7 +312,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer, // If no connection to JACK // try to launch JACK - if the configuration wants us to. if (!launchJack()) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); KMessageBox::error(this, i18n("Attempted to launch JACK audio daemon failed. Audio will be disabled.\nPlease check configuration (Settings -> Configure Rosegarden -> Audio -> Startup)\n and restart.")); } } else { @@ -1441,7 +1441,7 @@ void RosegardenGUIApp::initView() m_seqManager->setLoop(0, 0); stateChanged("have_range", KXMLGUIClient::StateReverse); } catch (TQString s) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); CurrentProgressDialog::freeze(); KMessageBox::error(this, s); CurrentProgressDialog::thaw(); @@ -1715,13 +1715,13 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType) if (!info.exists()) { // can happen with command-line arg, so... - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); KMessageBox::sorry(this, i18n("File \"%1\" does not exist").arg(filePath)); return 0; } if (info.isDir()) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); KMessageBox::sorry(this, i18n("File \"%1\" is actually a directory")); return 0; } @@ -1729,7 +1729,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType) TQFile file(filePath); if (!file.open(IO_ReadOnly)) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); TQString errStr = i18n("You do not have read permission for \"%1\"").arg(filePath); @@ -1795,7 +1795,7 @@ RosegardenGUIApp::createDocumentFromRGFile(TQString filePath) // At this point the splash screen may still be there, hide it if // it's the case - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); // It is, so ask the user if he wants to use the autosave file int reply = KMessageBox::questionYesNo(this, @@ -3709,7 +3709,7 @@ void RosegardenGUIApp::importProject(TQString filePath) *proc << "--unpack"; *proc << filePath; - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); proc->start(TDEProcess::Block, TDEProcess::All); if (!proc->normalExit() || proc->exitStatus()) { @@ -3774,7 +3774,7 @@ RosegardenGUIApp::guessTextCodec(std::string text) if (text[c] & 0x80) { CurrentProgressDialog::freeze(); - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); IdentifyTextCodecDialog dialog(0, text); dialog.exec(); @@ -3862,7 +3862,7 @@ RosegardenGUIApp::createDocumentFromMIDIFile(TQString file) MidiFile midiFile(fname, &newDoc->getStudio()); - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); ProgressDialog progressDlg(i18n("Importing MIDI file..."), 200, this); @@ -4021,7 +4021,7 @@ void RosegardenGUIApp::slotMergeRG21() RosegardenGUIDoc* RosegardenGUIApp::createDocumentFromRG21File(TQString file) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); ProgressDialog progressDlg( i18n("Importing Rosegarden 2.1 file..."), 100, this); @@ -4108,7 +4108,7 @@ void RosegardenGUIApp::slotMergeHydrogen() RosegardenGUIDoc* RosegardenGUIApp::createDocumentFromHydrogenFile(TQString file) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); ProgressDialog progressDlg( i18n("Importing Hydrogen file..."), 100, this); @@ -4835,7 +4835,7 @@ void RosegardenGUIApp::slotSequencerExited(TDEProcess*) { RG_DEBUG << "RosegardenGUIApp::slotSequencerExited Sequencer exited\n"; - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); if (m_sequencerCheckedIn) { @@ -6215,7 +6215,7 @@ RosegardenGUIApp::getArmedInstruments() void RosegardenGUIApp::showError(TQString error) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); CurrentProgressDialog::freeze(); // This is principally used for return values from DSSI plugin @@ -8037,7 +8037,7 @@ void RosegardenGUIApp::slotNewerVersionAvailable(TQString v) { if (m_firstRun) return; - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); CurrentProgressDialog::freeze(); awaitDialogClearance(); KMessageBox::information diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig index 4007322..4a009d2 100644 --- a/src/gui/application/RosegardenGUIApp.cpp.orig +++ b/src/gui/application/RosegardenGUIApp.cpp.orig @@ -139,7 +139,7 @@ #include "gui/editors/segment/TriggerSegmentManager.h" #include "gui/editors/tempo/TempoView.h" #include "gui/general/EditViewBase.h" -#include "gui/kdeext/KStartupLogo.h" +#include "gui/kdeext/TDEStartupLogo.h" #include "gui/kdeext/KTmpStatusMsg.h" #include "gui/seqmanager/MidiFilterDialog.h" #include "gui/seqmanager/SequenceManager.h" @@ -312,7 +312,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer, // If no connection to JACK // try to launch JACK - if the configuration wants us to. if (!launchJack()) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); KMessageBox::error(this, i18n("Attempted to launch JACK audio daemon failed. Audio will be disabled.\nPlease check configuration (Settings -> Configure Rosegarden -> Audio -> Startup)\n and restart.")); } } else { @@ -1441,7 +1441,7 @@ void RosegardenGUIApp::initView() m_seqManager->setLoop(0, 0); stateChanged("have_range", KXMLGUIClient::StateReverse); } catch (TQString s) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); CurrentProgressDialog::freeze(); KMessageBox::error(this, s); CurrentProgressDialog::thaw(); @@ -1715,13 +1715,13 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType) if (!info.exists()) { // can happen with command-line arg, so... - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); KMessageBox::sorry(this, i18n("File \"%1\" does not exist").arg(filePath)); return 0; } if (info.isDir()) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); KMessageBox::sorry(this, i18n("File \"%1\" is actually a directory")); return 0; } @@ -1729,7 +1729,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType) TQFile file(filePath); if (!file.open(IO_ReadOnly)) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); TQString errStr = i18n("You do not have read permission for \"%1\"").arg(filePath); @@ -1795,7 +1795,7 @@ RosegardenGUIApp::createDocumentFromRGFile(TQString filePath) // At this point the splash screen may still be there, hide it if // it's the case - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); // It is, so ask the user if he wants to use the autosave file int reply = KMessageBox::questionYesNo(this, @@ -3709,7 +3709,7 @@ void RosegardenGUIApp::importProject(TQString filePath) *proc << "--unpack"; *proc << filePath; - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); proc->start(TDEProcess::Block, TDEProcess::All); if (!proc->normalExit() || proc->exitStatus()) { @@ -3774,7 +3774,7 @@ RosegardenGUIApp::guessTextCodec(std::string text) if (text[c] & 0x80) { CurrentProgressDialog::freeze(); - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); IdentifyTextCodecDialog dialog(0, text); dialog.exec(); @@ -3862,7 +3862,7 @@ RosegardenGUIApp::createDocumentFromMIDIFile(TQString file) MidiFile midiFile(fname, &newDoc->getStudio()); - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); ProgressDialog progressDlg(i18n("Importing MIDI file..."), 200, this); @@ -4021,7 +4021,7 @@ void RosegardenGUIApp::slotMergeRG21() RosegardenGUIDoc* RosegardenGUIApp::createDocumentFromRG21File(TQString file) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); ProgressDialog progressDlg( i18n("Importing Rosegarden 2.1 file..."), 100, this); @@ -4108,7 +4108,7 @@ void RosegardenGUIApp::slotMergeHydrogen() RosegardenGUIDoc* RosegardenGUIApp::createDocumentFromHydrogenFile(TQString file) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); ProgressDialog progressDlg( i18n("Importing Hydrogen file..."), 100, this); @@ -4835,7 +4835,7 @@ void RosegardenGUIApp::slotSequencerExited(TDEProcess*) { RG_DEBUG << "RosegardenGUIApp::slotSequencerExited Sequencer exited\n"; - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); if (m_sequencerCheckedIn) { @@ -6215,7 +6215,7 @@ RosegardenGUIApp::getArmedInstruments() void RosegardenGUIApp::showError(TQString error) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); CurrentProgressDialog::freeze(); // This is principally used for return values from DSSI plugin @@ -8007,7 +8007,7 @@ void RosegardenGUIApp::slotNewerVersionAvailable(TQString v) { if (m_firstRun) return; - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); CurrentProgressDialog::freeze(); awaitDialogClearance(); KMessageBox::information diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp index 538e71b..ec9f867 100644 --- a/src/gui/application/main.cpp +++ b/src/gui/application/main.cpp @@ -47,7 +47,7 @@ #include "gui/application/RosegardenGUIApp.h" #include "gui/widgets/CurrentProgressDialog.h" #include "document/RosegardenGUIDoc.h" -#include "gui/kdeext/KStartupLogo.h" +#include "gui/kdeext/TDEStartupLogo.h" #include "gui/application/RosegardenApplication.h" #include "gui/application/RosegardenDCOP.h" @@ -554,13 +554,13 @@ int main(int argc, char *argv[]) // (c) The KDevelop Development Team // config->setGroup(GeneralOptionsConfigGroup); - KStartupLogo* startLogo = 0L; + TDEStartupLogo* startLogo = 0L; // See if the config wants us to control JACK // if (config->readBoolEntry("Logo", true) && (!kapp->isRestored() && args->isSet("splash")) ) { RG_DEBUG << k_funcinfo << "Showing startup logo\n"; - startLogo = KStartupLogo::getInstance(); + startLogo = TDEStartupLogo::getInstance(); startLogo->setShowTip(!newVersion); startLogo->show(); } @@ -713,7 +713,7 @@ int main(int argc, char *argv[]) } if (newVersion) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); CurrentProgressDialog::freeze(); KDialogBase *dialog = new KDialogBase(rosegardengui, "welcome", diff --git a/src/gui/editors/notation/NoteFontFactory.cpp b/src/gui/editors/notation/NoteFontFactory.cpp index 9760734..47855a1 100644 --- a/src/gui/editors/notation/NoteFontFactory.cpp +++ b/src/gui/editors/notation/NoteFontFactory.cpp @@ -32,7 +32,7 @@ #include "misc/Strings.h" #include "document/ConfigGroups.h" #include "base/Exception.h" -#include "gui/kdeext/KStartupLogo.h" +#include "gui/kdeext/TDEStartupLogo.h" #include "NoteFont.h" #include "NoteFontMap.h" #include