summaryrefslogtreecommitdiffstats
path: root/src/gui/application
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/application')
-rw-r--r--src/gui/application/RosegardenGUIApp.cpp30
-rw-r--r--src/gui/application/RosegardenGUIApp.cpp.orig30
-rw-r--r--src/gui/application/main.cpp8
3 files changed, 34 insertions, 34 deletions
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",
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-24 21:07:02 +0000